Changed the way of handling the search field reset