Final changes on event search