a few search improvments