Changed Search Functionality