Small changes to search.