Minor tweaks to search