Even more search cleanup