Added various html_safe calls to unescape html entities