Added missing HTML escapes