Tag safety upgrades