Slightly improve events filtering