Hopefully fixed the HTML escaping issue