Now saved XML file has a format close to initial one