more fixes to search