Searching is now more generic, but not generic enough *cough*
Merge ....