fixes to events filter