Improved event search.