Improve Search Functionality