Adding changes on search functionality