Fixed issues with GroupOrder which were preventing them from being serialized correctly by JsonConvert