Event Filtering modified