Escaped attributes and html missed in previous update