fix OR case of searching, add general search (not working)