Fix: filter on type of event was lost