Improve the exposed event search.