Adding tag validation handler

Protect against tags added via macro or api.
Merge branch 'Macro-protection'