Fixed filters on event handlers that where not working