Further tweaks to search.