Fixed search (it beat me once!)