more tweaks to search and update.