Tweak searching logic.