diff --git a/ifrs17/Report/ParameterReportsQueries.ipynb b/ifrs17/Report/ParameterReportsQueries.ipynb
index 81f6690a..7ed8af8a 100644
--- a/ifrs17/Report/ParameterReportsQueries.ipynb
+++ b/ifrs17/Report/ParameterReportsQueries.ipynb
@@ -279,30 +279,18 @@
                 "\n    .ToArray();",
                 "\n",
                 "\n    var currentYieldCurves = (await workspace.LoadCurrentYieldCurveAsync(args, dataNodeData))",
-                "\n    .Values",
-                "\n    .SelectMany(x => x.Select(y => new YieldCurveReportParameter {",
-                "\n        Period = ((Period)y.Key),",
-                "\n        YieldCurveType = \"Current Curve\",",
-                "\n        Year = y.Value.Year,",
-                "\n        Month = y.Value.Month,",
-                "\n        Scenario = y.Value.Scenario,",
-                "\n        Currency = y.Value.Currency,",
-                "\n        Name = y.Value.Name}",
-                "\n        ));",
-                "\n",
-                "\n    var allYieldCurves = lockedYieldCurves.Concat(lockedYieldCurves.SelectMany(loc => currentYieldCurves.Select(cuc => new YieldCurveReportParameter {",
-                "\n    GroupOfContract = loc.GroupOfContract,",
-                "\n    Period = cuc.Period,",
-                "\n    YieldCurveType = cuc.YieldCurveType,",
-                "\n    Year = cuc.Year,",
-                "\n    Month = cuc.Month,",
-                "\n    Scenario = cuc.Scenario,",
-                "\n    Currency = cuc.Currency,",
-                "\n    Name = cuc.Name}",
-                "\n    )))",
-                "\n    .ToArray();",
+                "\n    .SelectMany(kvp => kvp.Value.Select(kvpInner => new YieldCurveReportParameter{",
+                "\n        GroupOfContract = kvp.Key, ",
+                "\n        Period = (Period)kvpInner.Key, ",
+                "\n        YieldCurveType = \"CurrentCurve\", ",
+                "\n        Year = kvpInner.Value.Year, ",
+                "\n        Month = kvpInner.Value.Month, ",
+                "\n        Scenario = kvpInner.Value.Scenario, ",
+                "\n        Currency = kvpInner.Value.Currency, ",
+                "\n        Name = kvpInner.Value.Name",
+                "\n    })); ",
                 "\n    ",
-                "\n    return allYieldCurves;",
+                "\n    return currentYieldCurves.Concat(lockedYieldCurves).ToArray();",
                 "\n}"
             ],
             "metadata": {},