Include filter enabled and event remove action implemented