diff --git a/ifrs17-template/Database/MigrationAndScaffolding/Initial.ipynb b/ifrs17-template/Database/MigrationAndScaffolding/Initial.ipynb
index 2d41bce1..8eeca40e 100644
--- a/ifrs17-template/Database/MigrationAndScaffolding/Initial.ipynb
+++ b/ifrs17-template/Database/MigrationAndScaffolding/Initial.ipynb
@@ -37,7 +37,7 @@
         {
             "cell_type": "code",
             "source": [
-                "[Migration(\"20230425145745_InitialTypes\")]",
+                "[Migration(\"20230517120004_InitialTypes\")]",
                 "\npublic class InitialTypes : Migration",
                 "\n{",
                 "\n    protected override void Up(MigrationBuilder migrationBuilder)",
@@ -421,7 +421,8 @@
                 "\n                SystemName = table.Column<string>(type: \"nvarchar(16)\", maxLength: 16, nullable: false),",
                 "\n                Shift = table.Column<int>(type: \"int\", nullable: false),",
                 "\n                TimeStep = table.Column<int>(type: \"int\", nullable: false),",
-                "\n                DisplayName = table.Column<string>(type: \"nvarchar(max)\", nullable: true)",
+                "\n                DisplayName = table.Column<string>(type: \"nvarchar(max)\", nullable: true),",
+                "\n                Order = table.Column<int>(type: \"int\", nullable: false)",
                 "\n            },",
                 "\n            constraints: table =>",
                 "\n            {",
diff --git a/ifrs17/Report/ReportConfigurationAndUtils.ipynb b/ifrs17/Report/ReportConfigurationAndUtils.ipynb
index b31e0b07..c8f60f08 100644
--- a/ifrs17/Report/ReportConfigurationAndUtils.ipynb
+++ b/ifrs17/Report/ReportConfigurationAndUtils.ipynb
@@ -157,13 +157,14 @@
                 "\n",
                 "\n    await workspace.Partition.SetAsync<PartitionByReportingNode>(new { ReportingNode = args.ReportingNode, Scenario = (string)null});",
                 "\n    await workspace.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(new { ReportingNode = args.ReportingNode, Scenario = args.Scenario, Year = args.Year, Month = args.Month });",
-                "\n    var reportVariables = await workspace.Query<GroupOfContract>()",
+                "\n    var reportVariables = (await workspace.Query<GroupOfContract>()",
                 "\n            .Join(workspace.Query<IfrsVariable>(),",
                 "\n                  dn => dn.SystemName,",
                 "\n                  iv => iv.DataNode,",
                 "\n                  (dn, iv) => GetReportVariable(dn, iv, args, orderedProjectionConfigurations)",
-                "\n                  ).SelectMany(rv => rv) ",
-                "\n        .ToArrayAsync();",
+                "\n                  ) ",
+                "\n        .ToArrayAsync())",
+                "\n        .SelectMany(rv => rv).ToArray();",
                 "\n",
                 "\n    await workspace.Partition.SetAsync<PartitionByReportingNode>(null);",
                 "\n    await workspace.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(null);",