Minor tweaks to improve search.