Fix search in all the places it's broken, not just work queries

Fix search in all the places it's broken, not just work queries

https://code.google.com/p/otwarchive/issues/detail?id=3863