Worked on events filtering