Reworking of the event filtering