Final tweaks to search