Fix xml element order
Fix type of Subnet configuration