Adds some tags to html syntax

Adds some tags and fix #1564