Minor search tweaks