A good utility that lets you both search for pictures enhance them is Picasa. The application is available for both Windows and Mac operating system. At some point there was a Linux release available, but it was shortly discontinued. If defined, the application has the ability to search all your hard-disk for images of all types and based on the location and folder it can arrange those pictures in albums. Give it a try and you'll soon realize it's a wonderful application which suits your needs.