Small search tweaks