Corrected generated XML structure