improve filter event type