Fixing html escaping issues