Trying to fix html escaping issue