fix html escaping issues