events filter fixed