Added HTML escaping