Some search improvments