Updated Search Functionality