Fix extra quotes in custom tags in header

Fix #12939
Merge pull request #12940 from drarko/master

Fix extra quotes in custom tags in header