minor mods to search