Fix XML escaping issue