more search cleanup