search optimization - return albums if its title or description matches

[jerx]

I batch upload my pictures. Therefore pictures do not have title, description or keywords. I try to give them a descriptive name, but I am afraid that users do not search for file names. And even if they do, it would not work perfectly. You are not allowed to have spaces in file names, so these are ommited. The search does not work if you only specify one of the merged words, but you need to fill in all of those words. I could use underscores, but I would like to refrain from using that, because I use underscores to seperate the information, eg date_picturetakenatwhichlocation_occasion.jpg.

I would rather like to see the search returning pictures if their album title/description contains these words. Or it might be better to return the albums only and not every single picture in those albums.