Search Functionality Updated