Search Functionality changes