diff --git a/fsh-generated/fsh-index.json b/fsh-generated/fsh-index.json
index a7bc32b..a165464 100644
--- a/fsh-generated/fsh-index.json
+++ b/fsh-generated/fsh-index.json
@@ -13,7 +13,7 @@
     "fshType": "Instance",
     "fshFile": "capability-statement.fsh",
     "startLine": 33,
-    "endLine": 269
+    "endLine": 253
   },
   {
     "outputFile": "CarePlan-PatientKimMusterperson-Tumorkonferenz-1.json",
@@ -968,180 +968,148 @@
     "endLine": 14
   },
   {
-    "outputFile": "SearchParameter-mii-sp-onko-diagnose-ext-morphology-behavior-icdo3.json",
-    "fshName": "mii-sp-onko-diagnose-ext-morphology-behavior-icdo3",
-    "fshType": "Instance",
-    "fshFile": "searchParameter.fsh",
-    "startLine": 18,
-    "endLine": 30
-  },
-  {
-    "outputFile": "SearchParameter-mii-sp-onko-diagnose-verification-status.json",
-    "fshName": "mii-sp-onko-diagnose-verification-status",
+    "outputFile": "SearchParameter-mii-sp-onko-condition-ext-morphology-behavior-icdo3.json",
+    "fshName": "mii-sp-onko-condition-ext-morphology-behavior-icdo3",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 5,
-    "endLine": 16
+    "startLine": 6,
+    "endLine": 19
   },
   {
     "outputFile": "SearchParameter-mii-sp-onko-ext-strahlentherapie-stellungzurop.json",
     "fshName": "mii-sp-onko-ext-strahlentherapie-stellungzurop",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 111,
-    "endLine": 122
+    "startLine": 41,
+    "endLine": 52
   },
   {
     "outputFile": "SearchParameter-mii-sp-onko-nebenwirkung-suspectEntity.json",
     "fshName": "mii-sp-onko-nebenwirkung-suspectEntity",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 231,
-    "endLine": 242
-  },
-  {
-    "outputFile": "SearchParameter-mii-sp-onko-operation-complication.json",
-    "fshName": "mii-sp-onko-operation-complication",
-    "fshType": "Instance",
-    "fshFile": "searchParameter.fsh",
-    "startLine": 95,
-    "endLine": 106
+    "startLine": 164,
+    "endLine": 175
   },
   {
-    "outputFile": "SearchParameter-mii-sp-onko-operation-ext-intention.json",
-    "fshName": "mii-sp-onko-operation-ext-intention",
+    "outputFile": "SearchParameter-mii-sp-onko-procedure-ext-intention.json",
+    "fshName": "mii-sp-onko-procedure-ext-intention",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 82,
-    "endLine": 93
-  },
-  {
-    "outputFile": "SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart.json",
-    "fshName": "mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart",
-    "fshType": "Instance",
-    "fshFile": "searchParameter.fsh",
-    "startLine": 124,
-    "endLine": 135
+    "startLine": 21,
+    "endLine": 34
   },
   {
-    "outputFile": "SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-boost.json",
-    "fshName": "mii-sp-onko-strahlentherapie-ext-bestrahlung-boost",
+    "outputFile": "SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart.json",
+    "fshName": "mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 202,
-    "endLine": 213
+    "startLine": 54,
+    "endLine": 67
   },
   {
-    "outputFile": "SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis.json",
-    "fshName": "mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis",
+    "outputFile": "SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-boost.json",
+    "fshName": "mii-sp-onko-procedure-ext-strahlentherapie-bs-boost",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 189,
-    "endLine": 200
+    "startLine": 144,
+    "endLine": 157
   },
   {
-    "outputFile": "SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis.json",
-    "fshName": "mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis",
+    "outputFile": "SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis.json",
+    "fshName": "mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 176,
-    "endLine": 187
+    "startLine": 129,
+    "endLine": 142
   },
   {
-    "outputFile": "SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart.json",
-    "fshName": "mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart",
+    "outputFile": "SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis.json",
+    "fshName": "mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 137,
-    "endLine": 148
+    "startLine": 114,
+    "endLine": 127
   },
   {
-    "outputFile": "SearchParameter-mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet.json",
-    "fshName": "mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet",
+    "outputFile": "SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet.json",
+    "fshName": "mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 163,
-    "endLine": 174
+    "startLine": 99,
+    "endLine": 112
   },
   {
-    "outputFile": "SearchParameter-mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet.json",
-    "fshName": "mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet",
+    "outputFile": "SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart.json",
+    "fshName": "mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 150,
-    "endLine": 161
+    "startLine": 69,
+    "endLine": 82
   },
   {
-    "outputFile": "SearchParameter-mii-sp-onko-strahlentherapie-outcome.json",
-    "fshName": "mii-sp-onko-strahlentherapie-outcome",
+    "outputFile": "SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet.json",
+    "fshName": "mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 215,
-    "endLine": 226
+    "startLine": 84,
+    "endLine": 97
   },
   {
     "outputFile": "SearchParameter-mii-sp-onko-systemischetherapie-ext-stellungzurop.json",
     "fshName": "mii-sp-onko-systemischetherapie-ext-stellungzurop",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 248,
-    "endLine": 259
-  },
-  {
-    "outputFile": "SearchParameter-mii-sp-onko-tnm-klassifikation-has-member.json",
-    "fshName": "mii-sp-onko-tnm-klassifikation-has-member",
-    "fshType": "Instance",
-    "fshFile": "searchParameter.fsh",
-    "startLine": 41,
-    "endLine": 52
+    "startLine": 181,
+    "endLine": 192
   },
   {
     "outputFile": "SearchParameter-mii-sp-onko-tod-encounter.json",
     "fshName": "mii-sp-onko-tod-encounter",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 340,
-    "endLine": 351
+    "startLine": 273,
+    "endLine": 284
   },
   {
     "outputFile": "SearchParameter-mii-sp-onko-tod-focus.json",
     "fshName": "mii-sp-onko-tod-focus",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 327,
-    "endLine": 338
+    "startLine": 260,
+    "endLine": 271
   },
   {
     "outputFile": "SearchParameter-mii-sp-onko-tod-interpretation.json",
     "fshName": "mii-sp-onko-tod-interpretation",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 314,
-    "endLine": 325
+    "startLine": 247,
+    "endLine": 258
   },
   {
     "outputFile": "SearchParameter-mii-sp-onko-tumorkonferenz-addresses.json",
     "fshName": "mii-sp-onko-tumorkonferenz-addresses",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 298,
-    "endLine": 309
+    "startLine": 231,
+    "endLine": 242
   },
   {
     "outputFile": "SearchParameter-mii-sp-onko-tumorkonferenz-contributor.json",
     "fshName": "mii-sp-onko-tumorkonferenz-contributor",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 285,
-    "endLine": 296
+    "startLine": 218,
+    "endLine": 229
   },
   {
     "outputFile": "SearchParameter-mii-sp-onko-tumorkonferenz-created.json",
     "fshName": "mii-sp-onko-tumorkonferenz-created",
     "fshType": "Instance",
     "fshFile": "searchParameter.fsh",
-    "startLine": 272,
-    "endLine": 283
+    "startLine": 205,
+    "endLine": 216
   },
   {
     "outputFile": "Specimen-PatientKimMusterperson-Specimen-1.json",
diff --git a/fsh-generated/fsh-index.txt b/fsh-generated/fsh-index.txt
index a5f42f9..f6787e5 100644
--- a/fsh-generated/fsh-index.txt
+++ b/fsh-generated/fsh-index.txt
@@ -1,6 +1,6 @@
 Output File                                                                         Name                                                           Type        FSH File                                                                                     Lines
 AdverseEvent-mii-pr-onko-nebenwirkung-0.json                                        mii-pr-onko-nebenwirkung-0                                     Instance    oBDS\15_Nebenwirkung_ST_SYST\mii-exa-onko-nebenwirkung-0.fsh                                 1 - 10
-CapabilityStatement-mii-cps-onko-capabilitystatement.json                           mii-cps-onko-capabilitystatement                               Instance    capability-statement.fsh                                                                     33 - 269
+CapabilityStatement-mii-cps-onko-capabilitystatement.json                           mii-cps-onko-capabilitystatement                               Instance    capability-statement.fsh                                                                     33 - 253
 CarePlan-PatientKimMusterperson-Tumorkonferenz-1.json                               PatientKimMusterperson-Tumorkonferenz-1                        Instance    example-patient-1.fsh                                                                        85 - 100
 CarePlan-PatientKimMusterperson-Tumorkonferenz-2.json                               PatientKimMusterperson-Tumorkonferenz-2                        Instance    example-patient-1.fsh                                                                        172 - 184
 CarePlan-PatientKimMusterperson-Tumorkonferenz-3.json                               PatientKimMusterperson-Tumorkonferenz-3                        Instance    example-patient-1.fsh                                                                        329 - 342
@@ -120,28 +120,24 @@ Procedure-PatientKimMusterperson-SystemicTherapy-3.json
 Procedure-mii-exa-onko-operation-1.json                                             mii-exa-onko-operation-1                                       Instance    oBDS\13_OP\mii-exa-onko-operation.fsh                                                        1 - 16
 Procedure-mii-exa-onko-strahlentherapie.json                                        mii-exa-onko-strahlentherapie                                  Instance    oBDS\14_Strahlentherapie\mii-exa-onko-strahlentherapie.fsh                                   1 - 25
 Procedure-mii-exa-onko-systemische-therapie-1.json                                  mii-exa-onko-systemische-therapie-1                            Instance    oBDS\16_SystemischeTherapie\mii-exa-onko-systemische-therapie.fsh                            1 - 14
-SearchParameter-mii-sp-onko-diagnose-ext-morphology-behavior-icdo3.json             mii-sp-onko-diagnose-ext-morphology-behavior-icdo3             Instance    searchParameter.fsh                                                                          18 - 30
-SearchParameter-mii-sp-onko-diagnose-verification-status.json                       mii-sp-onko-diagnose-verification-status                       Instance    searchParameter.fsh                                                                          5 - 16
-SearchParameter-mii-sp-onko-ext-strahlentherapie-stellungzurop.json                 mii-sp-onko-ext-strahlentherapie-stellungzurop                 Instance    searchParameter.fsh                                                                          111 - 122
-SearchParameter-mii-sp-onko-nebenwirkung-suspectEntity.json                         mii-sp-onko-nebenwirkung-suspectEntity                         Instance    searchParameter.fsh                                                                          231 - 242
-SearchParameter-mii-sp-onko-operation-complication.json                             mii-sp-onko-operation-complication                             Instance    searchParameter.fsh                                                                          95 - 106
-SearchParameter-mii-sp-onko-operation-ext-intention.json                            mii-sp-onko-operation-ext-intention                            Instance    searchParameter.fsh                                                                          82 - 93
-SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart.json   mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart   Instance    searchParameter.fsh                                                                          124 - 135
-SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-boost.json             mii-sp-onko-strahlentherapie-ext-bestrahlung-boost             Instance    searchParameter.fsh                                                                          202 - 213
-SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis.json       mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis       Instance    searchParameter.fsh                                                                          189 - 200
-SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis.json       mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis       Instance    searchParameter.fsh                                                                          176 - 187
-SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart.json       mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart       Instance    searchParameter.fsh                                                                          137 - 148
-SearchParameter-mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet.json       mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet       Instance    searchParameter.fsh                                                                          163 - 174
-SearchParameter-mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet.json  mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet  Instance    searchParameter.fsh                                                                          150 - 161
-SearchParameter-mii-sp-onko-strahlentherapie-outcome.json                           mii-sp-onko-strahlentherapie-outcome                           Instance    searchParameter.fsh                                                                          215 - 226
-SearchParameter-mii-sp-onko-systemischetherapie-ext-stellungzurop.json              mii-sp-onko-systemischetherapie-ext-stellungzurop              Instance    searchParameter.fsh                                                                          248 - 259
-SearchParameter-mii-sp-onko-tnm-klassifikation-has-member.json                      mii-sp-onko-tnm-klassifikation-has-member                      Instance    searchParameter.fsh                                                                          41 - 52
-SearchParameter-mii-sp-onko-tod-encounter.json                                      mii-sp-onko-tod-encounter                                      Instance    searchParameter.fsh                                                                          340 - 351
-SearchParameter-mii-sp-onko-tod-focus.json                                          mii-sp-onko-tod-focus                                          Instance    searchParameter.fsh                                                                          327 - 338
-SearchParameter-mii-sp-onko-tod-interpretation.json                                 mii-sp-onko-tod-interpretation                                 Instance    searchParameter.fsh                                                                          314 - 325
-SearchParameter-mii-sp-onko-tumorkonferenz-addresses.json                           mii-sp-onko-tumorkonferenz-addresses                           Instance    searchParameter.fsh                                                                          298 - 309
-SearchParameter-mii-sp-onko-tumorkonferenz-contributor.json                         mii-sp-onko-tumorkonferenz-contributor                         Instance    searchParameter.fsh                                                                          285 - 296
-SearchParameter-mii-sp-onko-tumorkonferenz-created.json                             mii-sp-onko-tumorkonferenz-created                             Instance    searchParameter.fsh                                                                          272 - 283
+SearchParameter-mii-sp-onko-condition-ext-morphology-behavior-icdo3.json            mii-sp-onko-condition-ext-morphology-behavior-icdo3            Instance    searchParameter.fsh                                                                          6 - 19
+SearchParameter-mii-sp-onko-ext-strahlentherapie-stellungzurop.json                 mii-sp-onko-ext-strahlentherapie-stellungzurop                 Instance    searchParameter.fsh                                                                          41 - 52
+SearchParameter-mii-sp-onko-nebenwirkung-suspectEntity.json                         mii-sp-onko-nebenwirkung-suspectEntity                         Instance    searchParameter.fsh                                                                          164 - 175
+SearchParameter-mii-sp-onko-procedure-ext-intention.json                            mii-sp-onko-procedure-ext-intention                            Instance    searchParameter.fsh                                                                          21 - 34
+SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart.json  mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart  Instance    searchParameter.fsh                                                                          54 - 67
+SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-boost.json            mii-sp-onko-procedure-ext-strahlentherapie-bs-boost            Instance    searchParameter.fsh                                                                          144 - 157
+SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis.json      mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis      Instance    searchParameter.fsh                                                                          129 - 142
+SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis.json      mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis      Instance    searchParameter.fsh                                                                          114 - 127
+SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet.json     mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet     Instance    searchParameter.fsh                                                                          99 - 112
+SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart.json      mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart      Instance    searchParameter.fsh                                                                          69 - 82
+SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet.json       mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet       Instance    searchParameter.fsh                                                                          84 - 97
+SearchParameter-mii-sp-onko-systemischetherapie-ext-stellungzurop.json              mii-sp-onko-systemischetherapie-ext-stellungzurop              Instance    searchParameter.fsh                                                                          181 - 192
+SearchParameter-mii-sp-onko-tod-encounter.json                                      mii-sp-onko-tod-encounter                                      Instance    searchParameter.fsh                                                                          273 - 284
+SearchParameter-mii-sp-onko-tod-focus.json                                          mii-sp-onko-tod-focus                                          Instance    searchParameter.fsh                                                                          260 - 271
+SearchParameter-mii-sp-onko-tod-interpretation.json                                 mii-sp-onko-tod-interpretation                                 Instance    searchParameter.fsh                                                                          247 - 258
+SearchParameter-mii-sp-onko-tumorkonferenz-addresses.json                           mii-sp-onko-tumorkonferenz-addresses                           Instance    searchParameter.fsh                                                                          231 - 242
+SearchParameter-mii-sp-onko-tumorkonferenz-contributor.json                         mii-sp-onko-tumorkonferenz-contributor                         Instance    searchParameter.fsh                                                                          218 - 229
+SearchParameter-mii-sp-onko-tumorkonferenz-created.json                             mii-sp-onko-tumorkonferenz-created                             Instance    searchParameter.fsh                                                                          205 - 216
 Specimen-PatientKimMusterperson-Specimen-1.json                                     PatientKimMusterperson-Specimen-1                              Instance    example-patient-1.fsh                                                                        209 - 215
 Specimen-mii-exa-onko-specimen-1.json                                               mii-exa-onko-specimen-1                                        Instance    oBDS\06_Histologie\mii-exa-onko-specimen-1.fsh                                               1 - 7
 StructureDefinition-mii-ex-onko-histology-morphology-behavior-icdo3.json            MII_EX_Onko_Histology_Morphology_Behavior_ICDO3                Extension   oBDS\05_Diagnose\mii-ex-onko-histology-morphology-behavior-icdo3.fsh                         1 - 17
diff --git a/fsh-generated/includes/fsh-link-references.md b/fsh-generated/includes/fsh-link-references.md
index c2dd3b4..365965b 100644
--- a/fsh-generated/includes/fsh-link-references.md
+++ b/fsh-generated/includes/fsh-link-references.md
@@ -192,22 +192,18 @@
 [mii-exa-onko-weitere-klassifikationen-1]: Observation-mii-exa-onko-weitere-klassifikationen-1.html
 [mii-exa-onko-weitere-klassifikationen-2]: Observation-mii-exa-onko-weitere-klassifikationen-2.html
 [mii-pr-onko-nebenwirkung-0]: AdverseEvent-mii-pr-onko-nebenwirkung-0.html
-[mii-sp-onko-diagnose-ext-morphology-behavior-icdo3]: SearchParameter-mii-sp-onko-diagnose-ext-morphology-behavior-icdo3.html
-[mii-sp-onko-diagnose-verification-status]: SearchParameter-mii-sp-onko-diagnose-verification-status.html
+[mii-sp-onko-condition-ext-morphology-behavior-icdo3]: SearchParameter-mii-sp-onko-condition-ext-morphology-behavior-icdo3.html
 [mii-sp-onko-ext-strahlentherapie-stellungzurop]: SearchParameter-mii-sp-onko-ext-strahlentherapie-stellungzurop.html
 [mii-sp-onko-nebenwirkung-suspectEntity]: SearchParameter-mii-sp-onko-nebenwirkung-suspectEntity.html
-[mii-sp-onko-operation-complication]: SearchParameter-mii-sp-onko-operation-complication.html
-[mii-sp-onko-operation-ext-intention]: SearchParameter-mii-sp-onko-operation-ext-intention.html
-[mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart]: SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart.html
-[mii-sp-onko-strahlentherapie-ext-bestrahlung-boost]: SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-boost.html
-[mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis]: SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis.html
-[mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis]: SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis.html
-[mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart]: SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart.html
-[mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet]: SearchParameter-mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet.html
-[mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet]: SearchParameter-mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet.html
-[mii-sp-onko-strahlentherapie-outcome]: SearchParameter-mii-sp-onko-strahlentherapie-outcome.html
+[mii-sp-onko-procedure-ext-intention]: SearchParameter-mii-sp-onko-procedure-ext-intention.html
+[mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart]: SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart.html
+[mii-sp-onko-procedure-ext-strahlentherapie-bs-boost]: SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-boost.html
+[mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis]: SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis.html
+[mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis]: SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis.html
+[mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet]: SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet.html
+[mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart]: SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart.html
+[mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet]: SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet.html
 [mii-sp-onko-systemischetherapie-ext-stellungzurop]: SearchParameter-mii-sp-onko-systemischetherapie-ext-stellungzurop.html
-[mii-sp-onko-tnm-klassifikation-has-member]: SearchParameter-mii-sp-onko-tnm-klassifikation-has-member.html
 [mii-sp-onko-tod-encounter]: SearchParameter-mii-sp-onko-tod-encounter.html
 [mii-sp-onko-tod-focus]: SearchParameter-mii-sp-onko-tod-focus.html
 [mii-sp-onko-tod-interpretation]: SearchParameter-mii-sp-onko-tod-interpretation.html
diff --git a/fsh-generated/resources/CapabilityStatement-mii-cps-onko-capabilitystatement.json b/fsh-generated/resources/CapabilityStatement-mii-cps-onko-capabilitystatement.json
index 1632150..2bc9f9d 100644
--- a/fsh-generated/resources/CapabilityStatement-mii-cps-onko-capabilitystatement.json
+++ b/fsh-generated/resources/CapabilityStatement-mii-cps-onko-capabilitystatement.json
@@ -127,7 +127,7 @@
             },
             {
               "name": "verificationStatus",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/verificationStatus",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-condition-verification-status",
               "type": "token",
               "extension": [
                 {
@@ -137,19 +137,8 @@
               ]
             },
             {
-              "name": "extension-morphology-behavior-icdo3",
-              "definition": "http://hl7.org/fhir/SearchParameter/Diagnose-morphology-behavior-icdo3",
-              "type": "token",
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
-            },
-            {
-              "name": "clinical-status",
-              "definition": "http://hl7.org/fhir/SearchParameter/Condition-clinical-status",
+              "name": "morphology-behavior-icdo3",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-condition-ext-morphology-behavior-icdo",
               "type": "token",
               "extension": [
                 {
@@ -202,17 +191,6 @@
                 }
               ]
             },
-            {
-              "name": "onset-date",
-              "definition": "http://hl7.org/fhir/SearchParameter/Condition-onset-date",
-              "type": "date",
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
-            },
             {
               "name": "recorded-date",
               "definition": "http://hl7.org/fhir/SearchParameter/Condition-recorded-date",
@@ -225,8 +203,8 @@
               ]
             },
             {
-              "name": "evidenc-detail",
-              "definition": "http://hl7.org/fhir/SearchParameter/Condition-evidence-detail",
+              "name": "evidence-detail",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-condition-evidence",
               "type": "reference",
               "extension": [
                 {
@@ -234,17 +212,6 @@
                   "valueCode": "SHALL"
                 }
               ]
-            },
-            {
-              "name": "note",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/note",
-              "type": "string",
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
             }
           ]
         },
@@ -973,7 +940,7 @@
             },
             {
               "name": "interpretation",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/interpretation",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-observation-interpretation",
               "type": "token",
               "extension": [
                 {
@@ -995,30 +962,8 @@
             },
             {
               "name": "note",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/note",
-              "type": "token",
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
-            },
-            {
-              "name": "specimen",
-              "definition": "http://hl7.org/fhir/SearchParameter/Observation-specimen",
-              "type": "reference",
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
-            },
-            {
-              "name": "device",
-              "definition": "http://hl7.org/fhir/SearchParameter/Observation-device",
-              "type": "reference",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-observation-note",
+              "type": "string",
               "extension": [
                 {
                   "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
@@ -1123,6 +1068,17 @@
                 }
               ]
             },
+            {
+              "name": "mode",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-mode",
+              "type": "token",
+              "extension": [
+                {
+                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
+                  "valueCode": "SHALL"
+                }
+              ]
+            },
             {
               "name": "title",
               "definition": "http://hl7.org/fhir/SearchParameter/List-title",
@@ -1155,6 +1111,28 @@
                   "valueCode": "SHALL"
                 }
               ]
+            },
+            {
+              "name": "flag",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-flag",
+              "type": "token",
+              "extension": [
+                {
+                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
+                  "valueCode": "SHALL"
+                }
+              ]
+            },
+            {
+              "name": "item",
+              "definition": "http://hl7.org/fhir/SearchParameter/List-item",
+              "type": "reference",
+              "extension": [
+                {
+                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
+                  "valueCode": "SHALL"
+                }
+              ]
             }
           ]
         },
@@ -1261,8 +1239,8 @@
               ]
             },
             {
-              "name": "extension-intention",
-              "definition": "http://hl7.org/fhir/SearchParameter/Operation-intention",
+              "name": "intention",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-intention",
               "type": "token",
               "extension": [
                 {
@@ -1293,28 +1271,6 @@
                 }
               ]
             },
-            {
-              "name": "status",
-              "definition": "http://hl7.org/fhir/SearchParameter/Procedure-status",
-              "type": "token",
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
-            },
-            {
-              "name": "category",
-              "definition": "http://hl7.org/fhir/SearchParameter/Procedure-category",
-              "type": "token",
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
-            },
             {
               "name": "code",
               "definition": "http://hl7.org/fhir/SearchParameter/clinical-code",
@@ -1327,7 +1283,7 @@
               ]
             },
             {
-              "name": "date",
+              "name": "performed",
               "definition": "http://hl7.org/fhir/SearchParameter/clinical-date",
               "type": "date",
               "extension": [
@@ -1348,20 +1304,9 @@
                 }
               ]
             },
-            {
-              "name": "body-site",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/",
-              "type": "token",
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
-            },
             {
               "name": "outcome",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/outcome",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-procedure-outcome",
               "type": "token",
               "extension": [
                 {
@@ -1372,7 +1317,7 @@
             },
             {
               "name": "complication",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/complication",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-procedure-complication",
               "type": "token",
               "extension": [
                 {
@@ -1404,8 +1349,8 @@
               ]
             },
             {
-              "name": "note",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/note",
+              "name": "strahlentherapie-stellung",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-stellungzurop",
               "type": "token",
               "extension": [
                 {
@@ -1415,8 +1360,8 @@
               ]
             },
             {
-              "name": "extension-stellung",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
+              "name": "bestrahlung-applikationsart",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart",
               "type": "token",
               "extension": [
                 {
@@ -1426,8 +1371,8 @@
               ]
             },
             {
-              "name": "extension-applikationsart",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
+              "name": "bestrahlung-strahlenart",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart",
               "type": "token",
               "extension": [
                 {
@@ -1437,8 +1382,8 @@
               ]
             },
             {
-              "name": "extension-strahlenart",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
+              "name": "bestrahlung-zielgebiet",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet",
               "type": "token",
               "extension": [
                 {
@@ -1448,8 +1393,8 @@
               ]
             },
             {
-              "name": "extension-zielgebiet",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
+              "name": "bestrahlung-zielgebiet-lateralitaet",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet",
               "type": "token",
               "extension": [
                 {
@@ -1459,9 +1404,9 @@
               ]
             },
             {
-              "name": "extension-zielgebiet-lateralitaet",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
-              "type": "token",
+              "name": "bestrahlung-gesamtdosis",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis",
+              "type": "quantity",
               "extension": [
                 {
                   "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
@@ -1470,8 +1415,8 @@
               ]
             },
             {
-              "name": "extension-gesamtdosis",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
+              "name": "bestrahlung-einzeldosis",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis",
               "type": "quantity",
               "extension": [
                 {
@@ -1481,9 +1426,9 @@
               ]
             },
             {
-              "name": "extension-einzeldosis",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
-              "type": "quantity",
+              "name": "bestrahlung-boost",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-boost",
+              "type": "token",
               "extension": [
                 {
                   "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
@@ -1492,8 +1437,8 @@
               ]
             },
             {
-              "name": "extension-boost",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
+              "name": "systemischetherapie-stellung",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-systemischetherapie-stellungzurop",
               "type": "token",
               "extension": [
                 {
@@ -1590,7 +1535,7 @@
             },
             {
               "name": "event",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/event",
+              "definition": "http://hl7.org/fhir/SearchParameter/event",
               "type": "token",
               "extension": [
                 {
@@ -1612,7 +1557,7 @@
             },
             {
               "name": "encounter",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-encounter",
               "type": "reference",
               "extension": [
                 {
@@ -1623,8 +1568,8 @@
             },
             {
               "name": "severity",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
-              "type": "reference",
+              "definition": "http://hl7.org/fhir/SearchParameter/severity",
+              "type": "token",
               "extension": [
                 {
                   "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
@@ -1634,7 +1579,7 @@
             },
             {
               "name": "suspectEntity",
-              "definition": "http://hl7.org/fhir/SearchParameter/",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-instance",
               "type": "reference",
               "extension": [
                 {
@@ -1730,20 +1675,9 @@
               ]
             },
             {
-              "name": "identifier",
-              "definition": "http://hl7.org/fhir/SearchParameter/clinical-identifier",
-              "type": "token",
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
-            },
-            {
-              "name": "status",
-              "definition": "http://hl7.org/fhir/SearchParameter/medications-status",
-              "type": "token",
+              "name": "based-on",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/",
+              "type": "reference",
               "extension": [
                 {
                   "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
@@ -1752,9 +1686,9 @@
               ]
             },
             {
-              "name": "category",
-              "definition": "http://hl7.org/fhir/SearchParameter/MedicationStatement-category",
-              "type": "token",
+              "name": "part-of",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/",
+              "type": "reference",
               "extension": [
                 {
                   "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
@@ -1795,20 +1729,9 @@
                 }
               ]
             },
-            {
-              "name": "subjecsourcet",
-              "definition": "http://hl7.org/fhir/SearchParameter/MedicationStatement-source",
-              "type": "reference",
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
-            },
             {
               "name": "note",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/note",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/",
               "type": "token",
               "extension": [
                 {
@@ -1970,8 +1893,8 @@
               ]
             },
             {
-              "name": "date",
-              "definition": "http://hl7.org/fhir/SearchParameter/clinical-date",
+              "name": "created",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-careplan-created",
               "type": "date",
               "extension": [
                 {
@@ -1982,7 +1905,7 @@
             },
             {
               "name": "addresses",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/addresses",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-careplan-addresses",
               "type": "reference",
               "extension": [
                 {
@@ -1993,7 +1916,7 @@
             },
             {
               "name": "supportingInfo",
-              "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-onko/SearchParameter/supportingInfo",
+              "definition": "https://www.medizininformatik-initiative.de/fhir/modul-meta/SearchParameter/mii-sp-meta-careplan-supporting-info",
               "type": "reference",
               "extension": [
                 {
@@ -2001,6 +1924,17 @@
                   "valueCode": "SHALL"
                 }
               ]
+            },
+            {
+              "name": "activity-code",
+              "definition": "http://hl7.org/fhir/SearchParameter/activity-code",
+              "type": "token",
+              "extension": [
+                {
+                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
+                  "valueCode": "SHALL"
+                }
+              ]
             }
           ]
         }
diff --git a/fsh-generated/resources/ImplementationGuide-mii-ig-onko-de-v2025.json b/fsh-generated/resources/ImplementationGuide-mii-ig-onko-de-v2025.json
index 46a5506..ebf9234 100644
--- a/fsh-generated/resources/ImplementationGuide-mii-ig-onko-de-v2025.json
+++ b/fsh-generated/resources/ImplementationGuide-mii-ig-onko-de-v2025.json
@@ -1594,18 +1594,10 @@
       },
       {
         "reference": {
-          "reference": "SearchParameter/mii-sp-onko-diagnose-ext-morphology-behavior-icdo3"
+          "reference": "SearchParameter/mii-sp-onko-condition-ext-morphology-behavior-icdo3"
         },
-        "name": "mii-sp-onko-diagnose-ext-morphology-behavior-icdo3",
-        "description": "SearchParameter for Diagnosis.extension[morphology-behaviour-icdo3]",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "SearchParameter/mii-sp-onko-diagnose-verification-status"
-        },
-        "name": "mii-sp-onko-diagnose-verification-status",
-        "description": "SearchParameter for Condition.verificationStatus",
+        "name": "mii-sp-onko-condition-ext-morphology-behavior-icdo3",
+        "description": "SearchParameter for Condition.extension[morphology-behaviour-icdo3]",
         "exampleBoolean": false
       },
       {
@@ -1626,82 +1618,66 @@
       },
       {
         "reference": {
-          "reference": "SearchParameter/mii-sp-onko-operation-complication"
-        },
-        "name": "mii-sp-onko-operation-complication",
-        "description": "SearchParameter for Procedure.complication",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "SearchParameter/mii-sp-onko-operation-ext-intention"
+          "reference": "SearchParameter/mii-sp-onko-procedure-ext-intention"
         },
-        "name": "mii-sp-onko-operation-ext-intention",
-        "description": "SearchParameter for Procedure.extension.intention",
+        "name": "mii-sp-onko-procedure-ext-intention",
+        "description": "SearchParameter for Procedure.extension[intention]",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "SearchParameter/mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart"
+          "reference": "SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart"
         },
-        "name": "mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart",
+        "name": "mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart",
         "description": "SearchParameter for Procedure.extension:bestrahlung.extension:applikationsart",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "SearchParameter/mii-sp-onko-strahlentherapie-ext-bestrahlung-boost"
+          "reference": "SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-boost"
         },
-        "name": "mii-sp-onko-strahlentherapie-ext-bestrahlung-boost",
+        "name": "mii-sp-onko-procedure-ext-strahlentherapie-bs-boost",
         "description": "SearchParameter for Procedure.extension:bestrahlung.extension:boost",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "SearchParameter/mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis"
+          "reference": "SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis"
         },
-        "name": "mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis",
+        "name": "mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis",
         "description": "SearchParameter for Procedure.extension:bestrahlung.extension:einzeldosis",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "SearchParameter/mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis"
+          "reference": "SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis"
         },
-        "name": "mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis",
+        "name": "mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis",
         "description": "SearchParameter for Procedure.extension:bestrahlung.extension:gesamtdosis",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "SearchParameter/mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart"
-        },
-        "name": "mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart",
-        "description": "SearchParameter for Procedure.extension:bestrahlung.extension:strahlenart",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "SearchParameter/mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet"
+          "reference": "SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet"
         },
-        "name": "mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet",
+        "name": "mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet",
         "description": "SearchParameter for Procedure.extension:bestrahlung.extension:zielgebiet_Lateralitaet",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "SearchParameter/mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet"
+          "reference": "SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart"
         },
-        "name": "mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet",
-        "description": "SearchParameter for Procedure.extension:bestrahlung.extension:zielgebiet",
+        "name": "mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart",
+        "description": "SearchParameter for Procedure.extension:bestrahlung.extension:strahlenart",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "SearchParameter/mii-sp-onko-strahlentherapie-outcome"
+          "reference": "SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet"
         },
-        "name": "mii-sp-onko-strahlentherapie-outcome",
-        "description": "SearchParameter for Procedure.outcome",
+        "name": "mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet",
+        "description": "SearchParameter for Procedure.extension:bestrahlung.extension:zielgebiet",
         "exampleBoolean": false
       },
       {
@@ -1712,14 +1688,6 @@
         "description": "SearchParameter for Procedure.extension[StellungZurOp]",
         "exampleBoolean": false
       },
-      {
-        "reference": {
-          "reference": "SearchParameter/mii-sp-onko-tnm-klassifikation-has-member"
-        },
-        "name": "mii-sp-onko-tnm-klassifikation-has-member",
-        "description": "SearchParameter for Observation.hasMember",
-        "exampleBoolean": false
-      },
       {
         "reference": {
           "reference": "SearchParameter/mii-sp-onko-tod-encounter"
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-condition-ext-morphology-behavior-icdo3.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-condition-ext-morphology-behavior-icdo3.json
new file mode 100644
index 0000000..4f57843
--- /dev/null
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-condition-ext-morphology-behavior-icdo3.json
@@ -0,0 +1,45 @@
+{
+  "resourceType": "SearchParameter",
+  "id": "mii-sp-onko-condition-ext-morphology-behavior-icdo3",
+  "meta": {
+    "profile": [
+      "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-pr-meta-searchparameter"
+    ]
+  },
+  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-condition-ext-morphology-behavior-icdo3",
+  "publisher": "Medizininformatik Initiative",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "https://www.medizininformatik-initiative.de"
+        }
+      ]
+    }
+  ],
+  "extension": [
+    {
+      "url": "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-ex-meta-license-codeable",
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "code": "CC-BY-4.0",
+            "system": "http://hl7.org/fhir/spdx-license",
+            "display": "Creative Commons Attribution 4.0 International"
+          }
+        ]
+      }
+    }
+  ],
+  "version": "2025.0.0",
+  "name": "MII_SP_Condition_Extension_Morphology_Behaviour_ICD-O-3",
+  "description": "SearchParameter for Condition.extension[morphology-behaviour-icdo3]",
+  "status": "active",
+  "code": "morphology-behavior-icdo3",
+  "base": [
+    "Condition"
+  ],
+  "type": "token",
+  "expression": "Condition.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-histology-morphology-behavior-icdo3').value"
+}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-diagnose-ext-morphology-behavior-icdo3.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-diagnose-ext-morphology-behavior-icdo3.json
deleted file mode 100644
index 9fa3bb9..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-diagnose-ext-morphology-behavior-icdo3.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-diagnose-ext-morphology-behavior-icdo3",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-diagnose-ext-morphology-behavior-icdo3",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Diagnose_Extension_Morphology_Behaviour_ICD-O-3",
-  "description": "SearchParameter for Diagnosis.extension[morphology-behaviour-icdo3]",
-  "status": "active",
-  "code": "extension-morphology-behavior-icdo3",
-  "base": [
-    "Diagnosis"
-  ],
-  "type": "token",
-  "expression": "Diagnosis.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-histology-morphology-behavior-icdo3').value"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-diagnose-verification-status.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-diagnose-verification-status.json
deleted file mode 100644
index cabf729..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-diagnose-verification-status.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-diagnose-verification-status",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-diagnose-verification-status",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Diagnose_verification_status",
-  "description": "SearchParameter for Condition.verificationStatus",
-  "status": "active",
-  "code": "verification-status",
-  "base": [
-    "Condition"
-  ],
-  "type": "token",
-  "expression": "Condition.verificationStatus"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-ext-strahlentherapie-stellungzurop.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-ext-strahlentherapie-stellungzurop.json
index 7aa625b..c9cbb88 100644
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-ext-strahlentherapie-stellungzurop.json
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-ext-strahlentherapie-stellungzurop.json
@@ -17,7 +17,7 @@
   "name": "MII_SP_Extension_StellungZurOp",
   "description": "SearchParameter for Procedure.extension[StellungZurOp]",
   "status": "active",
-  "code": "extension-stellungzurop",
+  "code": "strahlentherapie-stellungzurop",
   "base": [
     "Procedure"
   ],
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-operation-complication.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-operation-complication.json
deleted file mode 100644
index 17125f0..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-operation-complication.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-operation-complication",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-operation-complication",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Operation_Complication",
-  "description": "SearchParameter for Procedure.complication",
-  "status": "active",
-  "code": "complication",
-  "base": [
-    "Procedure"
-  ],
-  "type": "token",
-  "expression": "Procedure.complication"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-operation-ext-intention.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-operation-ext-intention.json
deleted file mode 100644
index 0e60702..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-operation-ext-intention.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-operation-ext-intention",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-operation-ext-intention",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Operation_Extension_Intention",
-  "description": "SearchParameter for Procedure.extension.intention",
-  "status": "active",
-  "code": "extension-intention",
-  "base": [
-    "Procedure"
-  ],
-  "type": "token",
-  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-operation-intention').value"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-intention.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-intention.json
new file mode 100644
index 0000000..3e45229
--- /dev/null
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-intention.json
@@ -0,0 +1,45 @@
+{
+  "resourceType": "SearchParameter",
+  "id": "mii-sp-onko-procedure-ext-intention",
+  "meta": {
+    "profile": [
+      "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-pr-meta-searchparameter"
+    ]
+  },
+  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-intention",
+  "publisher": "Medizininformatik Initiative",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "https://www.medizininformatik-initiative.de"
+        }
+      ]
+    }
+  ],
+  "extension": [
+    {
+      "url": "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-ex-meta-license-codeable",
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "code": "CC-BY-4.0",
+            "system": "http://hl7.org/fhir/spdx-license",
+            "display": "Creative Commons Attribution 4.0 International"
+          }
+        ]
+      }
+    }
+  ],
+  "version": "2025.0.0",
+  "name": "MII_SP_Procedure_Extension_Intention",
+  "description": "SearchParameter for Procedure.extension[intention]",
+  "status": "active",
+  "code": "intention",
+  "base": [
+    "Procedure"
+  ],
+  "type": "token",
+  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-intention').value"
+}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart.json
new file mode 100644
index 0000000..477151c
--- /dev/null
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart.json
@@ -0,0 +1,45 @@
+{
+  "resourceType": "SearchParameter",
+  "id": "mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart",
+  "meta": {
+    "profile": [
+      "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-pr-meta-searchparameter"
+    ]
+  },
+  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-applikationsart",
+  "publisher": "Medizininformatik Initiative",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "https://www.medizininformatik-initiative.de"
+        }
+      ]
+    }
+  ],
+  "extension": [
+    {
+      "url": "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-ex-meta-license-codeable",
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "code": "CC-BY-4.0",
+            "system": "http://hl7.org/fhir/spdx-license",
+            "display": "Creative Commons Attribution 4.0 International"
+          }
+        ]
+      }
+    }
+  ],
+  "version": "2025.0.0",
+  "name": "MII_SP_Procedure_Extension_Strahlentherapie_Bestrahlung_Applikationsart",
+  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:applikationsart",
+  "status": "active",
+  "code": "bestrahlung-applikationsart",
+  "base": [
+    "Procedure"
+  ],
+  "type": "token",
+  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Applikationsart').value"
+}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-boost.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-boost.json
new file mode 100644
index 0000000..01500d2
--- /dev/null
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-boost.json
@@ -0,0 +1,45 @@
+{
+  "resourceType": "SearchParameter",
+  "id": "mii-sp-onko-procedure-ext-strahlentherapie-bs-boost",
+  "meta": {
+    "profile": [
+      "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-pr-meta-searchparameter"
+    ]
+  },
+  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-boost",
+  "publisher": "Medizininformatik Initiative",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "https://www.medizininformatik-initiative.de"
+        }
+      ]
+    }
+  ],
+  "extension": [
+    {
+      "url": "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-ex-meta-license-codeable",
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "code": "CC-BY-4.0",
+            "system": "http://hl7.org/fhir/spdx-license",
+            "display": "Creative Commons Attribution 4.0 International"
+          }
+        ]
+      }
+    }
+  ],
+  "version": "2025.0.0",
+  "name": "MII_SP_Procedure_Extension_Strahlentherapie_Bestrahlung_Boost",
+  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:boost",
+  "status": "active",
+  "code": "bestrahlung-boost",
+  "base": [
+    "Procedure"
+  ],
+  "type": "token",
+  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Boost').value"
+}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis.json
new file mode 100644
index 0000000..31c1d5f
--- /dev/null
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis.json
@@ -0,0 +1,45 @@
+{
+  "resourceType": "SearchParameter",
+  "id": "mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis",
+  "meta": {
+    "profile": [
+      "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-pr-meta-searchparameter"
+    ]
+  },
+  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-einzeldosis",
+  "publisher": "Medizininformatik Initiative",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "https://www.medizininformatik-initiative.de"
+        }
+      ]
+    }
+  ],
+  "extension": [
+    {
+      "url": "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-ex-meta-license-codeable",
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "code": "CC-BY-4.0",
+            "system": "http://hl7.org/fhir/spdx-license",
+            "display": "Creative Commons Attribution 4.0 International"
+          }
+        ]
+      }
+    }
+  ],
+  "version": "2025.0.0",
+  "name": "MII_SP_Procedure_Extension_Strahlentherapie_Bestrahlung_Einzeldosis",
+  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:einzeldosis",
+  "status": "active",
+  "code": "bestrahlung-einzeldosis",
+  "base": [
+    "Procedure"
+  ],
+  "type": "quantity",
+  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Einzeldosis').value"
+}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis.json
new file mode 100644
index 0000000..35c37aa
--- /dev/null
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis.json
@@ -0,0 +1,45 @@
+{
+  "resourceType": "SearchParameter",
+  "id": "mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis",
+  "meta": {
+    "profile": [
+      "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-pr-meta-searchparameter"
+    ]
+  },
+  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-gesamtdosis",
+  "publisher": "Medizininformatik Initiative",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "https://www.medizininformatik-initiative.de"
+        }
+      ]
+    }
+  ],
+  "extension": [
+    {
+      "url": "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-ex-meta-license-codeable",
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "code": "CC-BY-4.0",
+            "system": "http://hl7.org/fhir/spdx-license",
+            "display": "Creative Commons Attribution 4.0 International"
+          }
+        ]
+      }
+    }
+  ],
+  "version": "2025.0.0",
+  "name": "MII_SP_Procedure_Extension_Strahlentherapie_Bestrahlung_Gesamtdosis",
+  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:gesamtdosis",
+  "status": "active",
+  "code": "bestrahlung-gesamtdosis",
+  "base": [
+    "Procedure"
+  ],
+  "type": "quantity",
+  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Gesamtdosis').value"
+}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet.json
new file mode 100644
index 0000000..f902ac5
--- /dev/null
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet.json
@@ -0,0 +1,45 @@
+{
+  "resourceType": "SearchParameter",
+  "id": "mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet",
+  "meta": {
+    "profile": [
+      "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-pr-meta-searchparameter"
+    ]
+  },
+  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-lateralitaet",
+  "publisher": "Medizininformatik Initiative",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "https://www.medizininformatik-initiative.de"
+        }
+      ]
+    }
+  ],
+  "extension": [
+    {
+      "url": "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-ex-meta-license-codeable",
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "code": "CC-BY-4.0",
+            "system": "http://hl7.org/fhir/spdx-license",
+            "display": "Creative Commons Attribution 4.0 International"
+          }
+        ]
+      }
+    }
+  ],
+  "version": "2025.0.0",
+  "name": "MII_SP_Procedure_Extension_Strahlentherapie_Bestrahlung_Zielgebiet_Lateralitaet",
+  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:zielgebiet_Lateralitaet",
+  "status": "active",
+  "code": "bestrahlung-zielgebiet-lateralitaet",
+  "base": [
+    "Procedure"
+  ],
+  "type": "token",
+  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Zielgebiet_Lateralitaet').value"
+}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart.json
new file mode 100644
index 0000000..ec812fe
--- /dev/null
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart.json
@@ -0,0 +1,45 @@
+{
+  "resourceType": "SearchParameter",
+  "id": "mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart",
+  "meta": {
+    "profile": [
+      "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-pr-meta-searchparameter"
+    ]
+  },
+  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-strahlenart",
+  "publisher": "Medizininformatik Initiative",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "https://www.medizininformatik-initiative.de"
+        }
+      ]
+    }
+  ],
+  "extension": [
+    {
+      "url": "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-ex-meta-license-codeable",
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "code": "CC-BY-4.0",
+            "system": "http://hl7.org/fhir/spdx-license",
+            "display": "Creative Commons Attribution 4.0 International"
+          }
+        ]
+      }
+    }
+  ],
+  "version": "2025.0.0",
+  "name": "MII_SP_Procedure_Extension_Strahlentherapie_Bestrahlung_Strahlenart",
+  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:strahlenart",
+  "status": "active",
+  "code": "bestrahlung-strahlenart",
+  "base": [
+    "Procedure"
+  ],
+  "type": "token",
+  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Strahlenart').value"
+}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet.json
new file mode 100644
index 0000000..d40f374
--- /dev/null
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet.json
@@ -0,0 +1,45 @@
+{
+  "resourceType": "SearchParameter",
+  "id": "mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet",
+  "meta": {
+    "profile": [
+      "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-pr-meta-searchparameter"
+    ]
+  },
+  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-procedure-ext-strahlentherapie-bs-zielgebiet",
+  "publisher": "Medizininformatik Initiative",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "https://www.medizininformatik-initiative.de"
+        }
+      ]
+    }
+  ],
+  "extension": [
+    {
+      "url": "https://www.medizininformatik-initiative.de/fhir/modul-meta/StructureDefinition/mii-ex-meta-license-codeable",
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "code": "CC-BY-4.0",
+            "system": "http://hl7.org/fhir/spdx-license",
+            "display": "Creative Commons Attribution 4.0 International"
+          }
+        ]
+      }
+    }
+  ],
+  "version": "2025.0.0",
+  "name": "MII_SP_Procedure_Extension_Strahlentherapie_Bestrahlung_Zielgebiet",
+  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:zielgebiet",
+  "status": "active",
+  "code": "bestrahlung-zielgebiet",
+  "base": [
+    "Procedure"
+  ],
+  "type": "token",
+  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Zielgebiet').value"
+}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart.json
deleted file mode 100644
index da33980..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-strahlentherapie-ext-bestrahlung-applikationsart",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Strahlentherapie_Extension_Bestrahlung_Applikationsart",
-  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:applikationsart",
-  "status": "active",
-  "code": "extension-bestrahlung-applikationsart",
-  "base": [
-    "Procedure"
-  ],
-  "type": "token",
-  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Applikationsart').value"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-boost.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-boost.json
deleted file mode 100644
index ea223bc..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-boost.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-strahlentherapie-ext-bestrahlung-boost",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-strahlentherapie-ext-bestrahlung-boost",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Strahlentherapie_Extension_Bestrahlung_Boost",
-  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:boost",
-  "status": "active",
-  "code": "extension-bestrahlung-boost",
-  "base": [
-    "Procedure"
-  ],
-  "type": "token",
-  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Boost').value"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis.json
deleted file mode 100644
index 2715f7a..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-strahlentherapie-ext-bestrahlung-einzeldosis",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Strahlentherapie_Extension_Bestrahlung_Einzeldosis",
-  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:einzeldosis",
-  "status": "active",
-  "code": "extension-bestrahlung-einzeldosis",
-  "base": [
-    "Procedure"
-  ],
-  "type": "quantity",
-  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Einzeldosis').value"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis.json
deleted file mode 100644
index ec28064..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-strahlentherapie-ext-bestrahlung-gesamtdosis",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Strahlentherapie_Extension_Bestrahlung_Gesamtdosis",
-  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:gesamtdosis",
-  "status": "active",
-  "code": "extension-bestrahlung-gesamtdosis",
-  "base": [
-    "Procedure"
-  ],
-  "type": "quantity",
-  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Gesamtdosis').value"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart.json
deleted file mode 100644
index 65d1b47..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-strahlentherapie-ext-bestrahlung-strahlenart",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Strahlentherapie_Extension_Bestrahlung_Strahlenart",
-  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:strahlenart",
-  "status": "active",
-  "code": "extension-bestrahlung-strahlenart",
-  "base": [
-    "Procedure"
-  ],
-  "type": "token",
-  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Strahlenart').value"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet.json
deleted file mode 100644
index 6f3d326..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-strahlentherapie-ext-zielgebiet-lateralitaet",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Strahlentherapie_Extension_Bestrahlung_Zielgebiet_Lateralitaet",
-  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:zielgebiet_Lateralitaet",
-  "status": "active",
-  "code": "extension-bestrahlung-zielgebiet-Lateralitaet",
-  "base": [
-    "Procedure"
-  ],
-  "type": "token",
-  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Zielgebiet_Lateralitaet').value"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet.json
deleted file mode 100644
index 3248ea3..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-strahlentherapie-extension-bestrahlung-zielgebiet",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Strahlentherapie_Extension_Bestrahlung_Zielgebiet",
-  "description": "SearchParameter for Procedure.extension:bestrahlung.extension:zielgebiet",
-  "status": "active",
-  "code": "extension-bestrahlung-zielgebiet",
-  "base": [
-    "Procedure"
-  ],
-  "type": "token",
-  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Zielgebiet').value"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-outcome.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-outcome.json
deleted file mode 100644
index 9c6a1e8..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-strahlentherapie-outcome.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-strahlentherapie-outcome",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-strahlentherapie-outcome",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_Strahlentherapie_Outcome",
-  "description": "SearchParameter for Procedure.outcome",
-  "status": "active",
-  "code": "outcome",
-  "base": [
-    "Procedure"
-  ],
-  "type": "token",
-  "expression": "Procedure.outcome"
-}
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-systemischetherapie-ext-stellungzurop.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-systemischetherapie-ext-stellungzurop.json
index 4a30ee4..5f5b24d 100644
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-systemischetherapie-ext-stellungzurop.json
+++ b/fsh-generated/resources/SearchParameter-mii-sp-onko-systemischetherapie-ext-stellungzurop.json
@@ -17,10 +17,10 @@
   "name": "MII_SP_Extension_StellungZurOp",
   "description": "SearchParameter for Procedure.extension[StellungZurOp]",
   "status": "active",
-  "code": "extension-stellungzurop",
+  "code": "systemischetherapie-stellungzurop",
   "base": [
     "Procedure"
   ],
   "type": "token",
-  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-systemische-therapie-stellung').value"
+  "expression": "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-systemische-therapie-stellungzurop').value"
 }
diff --git a/fsh-generated/resources/SearchParameter-mii-sp-onko-tnm-klassifikation-has-member.json b/fsh-generated/resources/SearchParameter-mii-sp-onko-tnm-klassifikation-has-member.json
deleted file mode 100644
index e8fa5d3..0000000
--- a/fsh-generated/resources/SearchParameter-mii-sp-onko-tnm-klassifikation-has-member.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "resourceType": "SearchParameter",
-  "id": "mii-sp-onko-tnm-klassifikation-has-member",
-  "url": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/SearchParameter/mii-sp-onko-tnm-klassifikation-has-member",
-  "publisher": "Medizininformatik Initiative",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "https://www.medizininformatik-initiative.de"
-        }
-      ]
-    }
-  ],
-  "version": "2025.0.0",
-  "name": "MII_SP_TNM_Klassifikationen_Has_Member",
-  "description": "SearchParameter for Observation.hasMember",
-  "status": "active",
-  "code": "has-member",
-  "base": [
-    "Observation"
-  ],
-  "type": "reference",
-  "expression": "Observation.hasMember"
-}
diff --git a/input/fsh/searchParameter.fsh b/input/fsh/searchParameter.fsh
index a280fc0..5921a17 100644
--- a/input/fsh/searchParameter.fsh
+++ b/input/fsh/searchParameter.fsh
@@ -46,7 +46,7 @@ Usage: #definition
 * name = "MII_SP_Extension_StellungZurOp"
 * description = "SearchParameter for Procedure.extension[StellungZurOp]"
 * status = #active 
-* code = #extension-stellungzurop
+* code = #strahlentherapie-stellungzurop
 * base = #Procedure
 * type = #token
 * expression = "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-stellungzurop').value"
@@ -156,20 +156,6 @@ Usage: #definition
 * type = #token
 * expression = "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-bestrahlung').extension.where(url='Boost').value"
 
-Instance: mii-sp-onko-procedure-ext-systemischetherapie-stellungzurop
-InstanceOf: SearchParameter
-Usage: #definition
-* insert SP_Publisher
-* insert LicenseCodeableCCBY40Instance
-* insert SP_Profile
-* insert Version
-* name = "MII_SP_Procedure_Extension_SystemischeTherapie_StellungZurOp"
-* description = "SearchParameter for Procedure.extension.systemischetherapie.stellung"
-* status = #active 
-* code = #systemischetherapie-stellungzur
-* base = #Procedure
-* type = #token
-* expression = "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-strahlentherapie-stellung').value"
 
 
 //----------------------------------------
@@ -200,10 +186,10 @@ Usage: #definition
 * name = "MII_SP_Extension_StellungZurOp"
 * description = "SearchParameter for Procedure.extension[StellungZurOp]"
 * status = #active 
-* code = #extension-stellungzurop
+* code = #systemischetherapie-stellungzurop
 * base = #Procedure
 * type = #token
-* expression = "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-systemische-therapie-stellung').value"
+* expression = "Procedure.extension.where(url='https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-ex-onko-systemische-therapie-stellungzurop').value"
 
 
 //----------------------------------------