Fixed bug with event search