Modify EventSearch