Final changes to event search criteria