Fix broken HTML elements and unescaped entities
Merge pull request #1153 from miken32/master