more search improvments