Js fix xml encoding issues

Js fix xml encoding issues