Improvements to search functionality