Fixes to Search