Fixed event-filter. Needs more work.
Merged