Tweak stopPropagation usage and filtering