Enhanced Search Functionality