Updated to check the TAG key a bit better.
Correctly cancel events where needed.