several search tweaks