more search fixes