Updated the search behaviour