Added escaping for atttributes
Added escaping for content