Search Functionality fixed