[#888] Implemented new HTML escaping