Add HtmlElement & fix some fields