Misc. HTML escaping fixes
Merge pull request #965 from emanwebdev/patch-1

Misc. HTML escaping fixes