Update to search #6634

Should fix the problem with poor search results.