Fixes #6543
Merge pull request #6553 from dotCMS/issue-6543-tag-manager

Fixes #6543