Still more search cleanup