Improve HTML escaping