more templates fixes for HTML5 validation, refs #158