Improve the HTML escaping