made some additional improvements to search