Minor search cleanup