Fix eventFilters