Fixes to search