more tweaks to search