Fixed whole search functionality.