Fix filtering out on & event properties from emitted event

Ref gh-55