Improves XmlFormat to keep the order of the properties as in the api result. Fixes #267