fix ordering to match XSD