Start fixing https://hackerone.com/reports/32529
Merge pull request #1442 from Mnkras/hotfix/attribute-display-xss

Start fixing https://hackerone.com/reports/32529