Simplified the search behaviour.