Fixed some HTML encoding issues