Removed unnecessary escaping when creating xml. But unescaping has still
to be done