Removed event type filtering