diff --git a/packages/demo/public/catalogues/catalogue-dktk.json b/packages/demo/public/catalogues/catalogue-dktk.json
index b14f045d..4da9df45 100644
--- a/packages/demo/public/catalogues/catalogue-dktk.json
+++ b/packages/demo/public/catalogues/catalogue-dktk.json
@@ -18261,11 +18261,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1a"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1a"
                                             }
                                             ]
                                         ]
@@ -18278,11 +18278,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1a1"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1a1"
                                             }
                                             ]
                                         ]
@@ -18295,11 +18295,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1a2"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1a2"
                                             }
                                             ]
                                         ]
@@ -18312,11 +18312,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1b"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1b"
                                             }
                                             ]
                                         ]
@@ -18329,11 +18329,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1b1"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1b1"
                                             }
                                             ]
                                         ]
@@ -18346,11 +18346,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1b2"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1b2"
                                             }
                                             ]
                                         ]
@@ -18363,11 +18363,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1c"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1c"
                                             }
                                             ]
                                         ]
@@ -18380,11 +18380,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1c1"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1c1"
                                             }
                                             ]
                                         ]
@@ -18397,11 +18397,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1c2"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1c2"
                                             }
                                             ]
                                         ]
@@ -18414,11 +18414,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1c3"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1c3"
                                             }
                                             ]
                                         ]
@@ -18431,11 +18431,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1d"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1d"
                                             }
                                             ]
                                         ]
@@ -18448,11 +18448,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "1mi"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "1mi"
                                             }
                                             ]
                                         ]
@@ -18475,11 +18475,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "2"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "2"
                                             }
                                             ]
                                         ]
@@ -18492,11 +18492,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "2a"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "2a"
                                             }
                                             ]
                                         ]
@@ -18509,11 +18509,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "2a1"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "2a1"
                                             }
                                             ]
                                         ]
@@ -18526,11 +18526,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "2a2"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "2a2"
                                             }
                                             ]
                                         ]
@@ -18543,11 +18543,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "2b"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "2b"
                                             }
                                             ]
                                         ]
@@ -18560,11 +18560,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "2c"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "2c"
                                             }
                                             ]
                                         ]
@@ -18577,11 +18577,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "2d"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "2d"
                                             }
                                             ]
                                         ]
@@ -18604,11 +18604,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "3"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "3"
                                             }
                                             ]
                                         ]
@@ -18621,11 +18621,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "3a"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "3a"
                                             }
                                             ]
                                         ]
@@ -18638,11 +18638,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "3b"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "3b"
                                             }
                                             ]
                                         ]
@@ -18655,11 +18655,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "3c"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "3c"
                                             }
                                             ]
                                         ]
@@ -18672,11 +18672,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "3d"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "3d"
                                             }
                                             ]
                                         ]
@@ -18699,11 +18699,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "4"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "4"
                                             }
                                             ]
                                         ]
@@ -18716,11 +18716,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "4a"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "4a"
                                             }
                                             ]
                                         ]
@@ -18733,11 +18733,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "4b"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "4b"
                                             }
                                             ]
                                         ]
@@ -18750,11 +18750,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "4c"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "4c"
                                             }
                                             ]
                                         ]
@@ -18767,11 +18767,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "4d"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "4d"
                                             }
                                             ]
                                         ]
@@ -18784,11 +18784,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "4e"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "4e"
                                             }
                                             ]
                                         ]
@@ -18811,11 +18811,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "a"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "a"
                                             }
                                             ]
                                         ]
@@ -18838,11 +18838,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "is"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "is"
                                             }
                                             ]
                                         ]
@@ -18855,11 +18855,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "is(DCIS)"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "is(DCIS)"
                                             }
                                             ]
                                         ]
@@ -18872,11 +18872,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "is(LCIS)"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "is(LCIS)"
                                             }
                                             ]
                                         ]
@@ -18889,11 +18889,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "is(Paget)"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "is(Paget)"
                                             }
                                             ]
                                         ]
@@ -18906,11 +18906,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "is(pd)"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "is(pd)"
                                             }
                                             ]
                                         ]
@@ -18923,11 +18923,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "is(pu)"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "is(pu)"
                                             }
                                             ]
                                         ]
@@ -18950,11 +18950,11 @@
                                             [
                                             {
                                                 "value": "21905-5",
-                                                "name": "0"
+                                                "name": "X"
                                             },
                                             {
                                                 "value": "21899-0",
-                                                "name": "0"
+                                                "name": "X"
                                             }
                                             ]
                                         ]
@@ -19023,7 +19023,19 @@
                             {
                                 "key": "0",
                                 "name": "0",
-                                "description": "0"
+                                "description": "0",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "0"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "0"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "0(sn)",
@@ -19033,77 +19045,308 @@
                             {
                                 "key": "0(i+)",
                                 "name": "0(i+)",
-                                "description": "0(i+)"
+                                "description": "0(i+)",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "0(i+)"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "0(i+)"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
-                                "key": "1",
-                                "name": "1",
-                                "description": "1"
+                                "key": "0(i-)",
+                                "name": "0(i-)",
+                                "description": "0(i-)",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "0(i-)"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "0(i-)"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
-                                "key": "1(sn)",
-                                "name": "1(sn)",
-                                "description": "1(sn)"
+                                "key": "0(mol+)",
+                                "name": "0(mol+)",
+                                "description": "0(mol+)",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "0(mol+)"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "0(mol+)"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
-                                "key": "1mi",
-                                "name": "1mi",
-                                "description": "1mi"
+                                "key": "0(mol-)",
+                                "name": "0(mol-)",
+                                "description": "0(mol-)",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "0(mol-)"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "0(mol-)"
+                                            }
+                                            ]
+                                        ]
+                            },
+                            {
+                                "key": "1",
+                                "name": "1",
+                                "description": "1",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "1"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "1"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "1a",
                                 "name": "1a",
-                                "description": "1a"
+                                "description": "1a",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "1a"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "1a"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "1b",
                                 "name": "1b",
-                                "description": "1b"
+                                "description": "1b",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "1b"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "1b"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "1c",
                                 "name": "1c",
-                                "description": "1c"
+                                "description": "1c",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "1c"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "1c"
+                                            }
+                                            ]
+                                        ]
+                            },
+                            {
+                                "key": "1mi",
+                                "name": "1mi",
+                                "description": "1mi",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "1mi"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "1mi"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "2",
                                 "name": "2",
-                                "description": "2"
+                                "description": "2",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "2"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "2"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "2a",
                                 "name": "2a",
-                                "description": "2a"
+                                "description": "2a",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "2a"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "2a"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "2b",
                                 "name": "2b",
-                                "description": "2b"
+                                "description": "2b",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "2b"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "2b"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "2c",
                                 "name": "2c",
-                                "description": "2c"
+                                "description": "2c",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "2c"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "2c"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "3",
                                 "name": "3",
-                                "description": "3"
+                                "description": "3",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "3"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "3"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "3a",
                                 "name": "3a",
-                                "description": "3a"
+                                "description": "3a",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "3a"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "3a"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "3b",
                                 "name": "3b",
-                                "description": "3b"
+                                "description": "3b",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "3b"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "3b"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "3c",
                                 "name": "3c",
-                                "description": "3c"
+                                "description": "3c",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "3c"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "3c"
+                                            }
+                                            ]
+                                        ]
+                            },
+                            {
+                                "key": "X",
+                                "name": "X",
+                                "description": "X",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21906-3",
+                                                "name": "X"
+                                            },
+                                            {
+                                                "value": "21900-6",
+                                                "name": "X"
+                                            }
+                                            ]
+                                        ]
                             }
                         ]
                     },
@@ -19115,157 +19358,194 @@
                         "type": "EQUALS",
                         "criteria": [
                             {
-                                "key": "2(cy-)",
-                                "name": "2(cy-)",
-                                "description": "2(cy-)"
-                            },
-                            {
-                                "key": "2(cy+)",
-                                "name": "2(cy+)",
-                                "description": "2(cy+)"
-                            },
-                            {
-                                "key": "2(mol-)",
-                                "name": "2(mol-)",
-                                "description": "2(mol-)"
-                            },
-                            {
-                                "key": "2(mol+)",
-                                "name": "2(mol+)",
-                                "description": "2(mol+)"
-                            },
-                            {
-                                "key": "2(i-)",
-                                "name": "2(i-)",
-                                "description": "2(i-)"
-                            },
-                            {
-                                "key": "2(i+)",
-                                "name": "2(i+)",
-                                "description": "2(i+)"
-                            },
-                            {
-                                "key": "1(cy-)",
-                                "name": "1(cy-)",
-                                "description": "1(cy-)"
-                            },
-                            {
-                                "key": "1(cy+)",
-                                "name": "1(cy+)",
-                                "description": "1(cy+)"
-                            },
-                            {
-                                "key": "1(mol-)",
-                                "name": "1(mol-)",
-                                "description": "1(mol-)"
-                            },
-                            {
-                                "key": "1(mol+)",
-                                "name": "1(mol+)",
-                                "description": "1(mol+)"
-                            },
-                            {
-                                "key": "1(i-)",
-                                "name": "1(i-)",
-                                "description": "1(i-)"
-                            },
-                            {
-                                "key": "1(i+)",
-                                "name": "1(i+)",
-                                "description": "1(i+)"
-                            },
-                            {
-                                "key": "1e",
-                                "name": "1e",
-                                "description": "1e"
-                            },
-                            {
-                                "key": "1d",
-                                "name": "1d",
-                                "description": "1d"
-                            },
-                            {
-                                "key": "0(cy-)",
-                                "name": "0(cy-)",
-                                "description": "0(cy-)"
-                            },
-                            {
-                                "key": "0(cy+)",
-                                "name": "0(cy+)",
-                                "description": "0(cy+)"
-                            },
-                            {
-                                "key": "0(mol-)",
-                                "name": "0(mol-)",
-                                "description": "0(mol-)"
-                            },
-                            {
-                                "key": "0(mol+)",
-                                "name": "0(mol+)",
-                                "description": "0(mol+)"
-                            },
-                            {
-                                "key": "0(i-)",
-                                "name": "0(i-)",
-                                "description": "0(i-)"
+                                "key": "0",
+                                "name": "0",
+                                "description": "0",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "0"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "0"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
-                                "key": "0(i+)",
-                                "name": "0(i+)",
-                                "description": "0(i+)"
+                                "key": "1",
+                                "name": "1",
+                                "description": "1",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "1"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "1"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "1a",
                                 "name": "1a",
-                                "description": "1a"
+                                "description": "1a",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "1a"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "1a"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "1b",
                                 "name": "1b",
-                                "description": "1b"
+                                "description": "1b",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "1b"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "1b"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "1c",
                                 "name": "1c",
-                                "description": "1c"
-                            },
-                            {
-                                "key": "2",
-                                "name": "2",
-                                "description": "2"
+                                "description": "1c",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "1c"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "1c"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
-                                "key": "2a",
-                                "name": "2a",
-                                "description": "2a"
+                                "key": "1d",
+                                "name": "1d",
+                                "description": "1d",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "1d"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "1d"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
-                                "key": "2b",
-                                "name": "2b",
-                                "description": "2b"
+                                "key": "1e",
+                                "name": "1e",
+                                "description": "1e",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "1e"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "1e"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
-                                "key": "2c",
-                                "name": "2c",
-                                "description": "2c"
+                                "key": "0(i-)",
+                                "name": "0(i-)",
+                                "description": "0(i-)",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "0(i-)"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "0(i-)"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
-                                "key": "1",
-                                "name": "1",
-                                "description": "1"
+                                "key": "0(i+)",
+                                "name": "0(i+)",
+                                "description": "0(i+)",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "0(i+)"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "0(i+)"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
-                                "key": "0",
-                                "name": "0",
-                                "description": "0"
+                                "key": "0(mol-)",
+                                "name": "0(mol-)",
+                                "description": "0(mol-)",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "0(mol-)"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "0(mol-)"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
-                                "key": "X",
-                                "name": "X",
-                                "description": "X"
+                                "key": "0(mol+)",
+                                "name": "0(mol+)",
+                                "description": "0(mol+)",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21907-1",
+                                                "name": "0(mol+)"
+                                            },
+                                            {
+                                                "value": "21901-4",
+                                                "name": "0(mol+)"
+                                            }
+                                            ]
+                                        ]
                             }
                         ]
-                    },
+},
                     {
                         "key": "42030-7",
                         "name": "TNM-m-Symbol",
@@ -19276,50 +19556,158 @@
                             {
                                 "key": "m",
                                 "name": "Kennzeichnet Vorhandensein multipler Primärtumoren in einem Bezirk",
-                                "description": "Kennzeichnet Vorhandensein multipler Primärtumoren in einem Bezirk"
+                                "description": "Kennzeichnet Vorhandensein multipler Primärtumoren in einem Bezirk",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "59479-6",
+                                                "name": "m"
+                                            },
+                                            {
+                                                "value": "59479-6",
+                                                "name": "m"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "2",
                                 "name": "(2) simultaner Tumoren",
-                                "description": "(2) simultaner Tumoren"
+                                "description": "(2) simultaner Tumoren",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "59479-6",
+                                                "name": "2"
+                                            },
+                                            {
+                                                "value": "59479-6",
+                                                "name": "2"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "3",
                                 "name": "(3) simultaner Tumoren",
-                                "description": "(3) simultaner Tumoren"
+                                "description": "(3) simultaner Tumoren",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "59479-6",
+                                                "name": "3"
+                                            },
+                                            {
+                                                "value": "59479-6",
+                                                "name": "3"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "4",
                                 "name": "(4) simultaner Tumoren",
-                                "description": "(4) simultaner Tumoren"
+                                "description": "(4) simultaner Tumoren",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "59479-6",
+                                                "name": "4"
+                                            },
+                                            {
+                                                "value": "59479-6",
+                                                "name": "4"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "5",
                                 "name": "(5) simultaner Tumoren",
-                                "description": "(5) simultaner Tumoren"
+                                "description": "(5) simultaner Tumoren",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "59479-6",
+                                                "name": "5"
+                                            },
+                                            {
+                                                "value": "59479-6",
+                                                "name": "5"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "6",
                                 "name": "(6) simultaner Tumoren",
-                                "description": "(6) simultaner Tumoren"
+                                "description": "(6) simultaner Tumoren",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "59479-6",
+                                                "name": "6"
+                                            },
+                                            {
+                                                "value": "59479-6",
+                                                "name": "6"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "7",
                                 "name": "(7) simultaner Tumoren",
-                                "description": "(7) simultaner Tumoren"
+                                "description": "(7) simultaner Tumoren",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "59479-6",
+                                                "name": "7"
+                                            },
+                                            {
+                                                "value": "59479-6",
+                                                "name": "7"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "8",
                                 "name": "(8) simultaner Tumoren",
-                                "description": "(8) simultaner Tumoren"
+                                "description": "(8) simultaner Tumoren",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "59479-6",
+                                                "name": "8"
+                                            },
+                                            {
+                                                "value": "59479-6",
+                                                "name": "8"
+                                            }
+                                            ]
+                                        ]
                             },
                             {
                                 "key": "9",
                                 "name": "(9) simultaner Tumoren",
-                                "description": "(9) simultaner Tumoren"
+                                "description": "(9) simultaner Tumoren",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "59479-6",
+                                                "name": "9"
+                                            },
+                                            {
+                                                "value": "59479-6",
+                                                "name": "9"
+                                            }
+                                            ]
+                                        ]
                             }
                         ]
-                    },
+},
                     {
                         "key": "59479-6",
                         "name": "TNM-y-Symbol",
@@ -19330,7 +19718,19 @@
                             {
                                 "key": "y",
                                 "name": "Klassifikation erfolgte während oder nach initialer multimodaler Therapie",
-                                "description": "Klassifikation erfolgte während oder nach initialer multimodaler Therapie"
+                                "description": "Klassifikation erfolgte während oder nach initialer multimodaler Therapie",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21983-2",
+                                                "name": "y"
+                                            },
+                                            {
+                                                "value": "21983-2",
+                                                "name": "y"
+                                            }
+                                            ]
+                                        ]
                             }
                         ]
                     },
@@ -19344,7 +19744,19 @@
                             {
                                 "key": "r",
                                 "name": "Klassifikation erfolgte zur Beurteilung eines Rezidivs",
-                                "description": "Klassifikation erfolgte zur Beurteilung eines Rezidivs"
+                                "description": "Klassifikation erfolgte zur Beurteilung eines Rezidivs",
+                                "aggregatedValue": [
+                                            [
+                                            {
+                                                "value": "21983-2",
+                                                "name": "r"
+                                            },
+                                            {
+                                                "value": "21983-2",
+                                                "name": "r"
+                                            }
+                                            ]
+                                        ]
                             }
                         ]
                     }