more search improvements