Fix event search