Append map name to tag name
Change checks - better illusion deprotection support