fixes to Search