Fix html validation
Merge branch 'hotfix/validator'