search-fixes