Fixed more event type filters