Even more search improvements.