Fixes to search.