search update, minor tweaks