Improvements to the search behaviour