HTML escaping bugfix