Improve search functionality