Fixed XSS
Merge branch 'hotfix/fixXss'