A little more search refinement.