Added event type filtering