And more search cleanup