diff --git a/packages/core/src/components/utility/form-tab/DFormTabGroups.vue b/packages/core/src/components/utility/form-tab/DFormTabGroups.vue
index e38112e1..b9ac5841 100644
--- a/packages/core/src/components/utility/form-tab/DFormTabGroups.vue
+++ b/packages/core/src/components/utility/form-tab/DFormTabGroups.vue
@@ -80,7 +80,12 @@ export default defineComponent({
         };
 
         const handleUpdated = (data: Record<string, any>) => {
-            items.value[currentIndex.value] = { ...data };
+            if (currentIndex.value === -1) {
+                items.value.push({ ...data });
+                currentIndex.value = 0;
+            } else {
+                items.value[currentIndex.value] = { ...data };
+            }
 
             emit('update:modelValue', items.value);
         };
@@ -98,10 +103,7 @@ export default defineComponent({
 </script>
 <template>
     <div class="d-flex flex-row">
-        <div
-            v-if="items.length > 0"
-            class="w-100"
-        >
+        <div class="w-100">
             <slot
                 :item="items[currentIndex]"
                 :updated="handleUpdated"
diff --git a/packages/core/src/domains/codesystem/api.ts b/packages/core/src/domains/codesystem/api.ts
index 9151e2dd..43a0de14 100644
--- a/packages/core/src/domains/codesystem/api.ts
+++ b/packages/core/src/domains/codesystem/api.ts
@@ -1,12 +1,14 @@
 import { BaseAPI } from '../api';
+import type { CollectionResponse } from '../types';
+import type { CodeSystem } from './types';
 
 export class CodeSystemAPI extends BaseAPI {
-    async getMany() {
+    async getMany() : Promise<CollectionResponse<CodeSystem>> {
         const response = await this.client.get('coding/codesystems');
         return response.data;
     }
 
-    async getOne(id: string) {
+    async getOne(id: string) : Promise<CodeSystem> {
         const response = await this.client.get(`coding/codesystems?uri=${id}`);
         return response.data;
     }
diff --git a/packages/core/src/domains/codesystem/index.ts b/packages/core/src/domains/codesystem/index.ts
index 4d4b4e29..8806bb51 100644
--- a/packages/core/src/domains/codesystem/index.ts
+++ b/packages/core/src/domains/codesystem/index.ts
@@ -1,2 +1,3 @@
 export * from './api';
 export * from './types';
+export * from './utils';
diff --git a/packages/core/src/domains/codesystem/utils.ts b/packages/core/src/domains/codesystem/utils.ts
new file mode 100644
index 00000000..a4ef77f6
--- /dev/null
+++ b/packages/core/src/domains/codesystem/utils.ts
@@ -0,0 +1,21 @@
+import type { CodeSystemConcept } from './types';
+
+type FormSelectOption = {
+    id: string | number,
+    value: any
+};
+
+export function transformConceptToFormSelectOption(
+    input: CodeSystemConcept,
+) : FormSelectOption {
+    let value : any;
+    if (typeof input.properties.name !== 'undefined') {
+        value = `${input.display}: ${input.properties.name}`;
+    } else {
+        value = `${input.code}: ${input.display}`;
+    }
+    return {
+        id: input.code,
+        value,
+    };
+}
diff --git a/packages/core/src/domains/coding/utils.ts b/packages/core/src/domains/coding/utils.ts
index f4ef5e6d..49fe0048 100644
--- a/packages/core/src/domains/coding/utils.ts
+++ b/packages/core/src/domains/coding/utils.ts
@@ -5,3 +5,74 @@ export function isCoding(input: unknown) : input is Coding {
     return isObject(input) &&
         typeof input.code === 'string';
 }
+
+type FormSelectOption = {
+    id: string | number,
+    value: any
+};
+
+export function transformCodingsToFormSelectOptions(
+    input: Coding[],
+): FormSelectOption[] {
+    const output : FormSelectOption[] = [];
+
+    for (let i = 0; i < input.length; i++) {
+        output.push({
+            id: input[i].code,
+            value: input[i].display || input[i].code,
+        });
+    }
+
+    return output;
+}
+
+export function transformFormSelectOptionsToCodings(
+    input: FormSelectOption[],
+): Coding[] {
+    const output : Coding[] = [];
+
+    for (let i = 0; i < input.length; i++) {
+        output.push({
+            code: `${input[i].id}`,
+        });
+    }
+
+    return output;
+}
+
+export function extractCodeFromCodingsRecord(
+    input: Record<string, Coding | Coding[]>,
+): Record<string, any> {
+    const output : Record<string, any> = {};
+
+    const keys = Object.keys(input);
+    for (let i = 0; i < keys.length; i++) {
+        const value = input[keys[i]];
+        if (Array.isArray(value)) {
+            output[keys[i]] = value.map((v) => v.code);
+        } else {
+            output[keys[i]] = value.code;
+        }
+    }
+
+    return output;
+}
+
+export function buildCodingsRecord(input: Record<string, any>) : Record<string, any> {
+    const output : Record<string, any> = {};
+    const keys = Object.keys(input);
+    for (let i = 0; i < keys.length; i++) {
+        const value = input[keys[i]];
+
+        if (Array.isArray(value)) {
+            output[keys[i]] = value.map((v) => ({
+                code: v,
+            } satisfies Coding));
+        } else if (value.length > 0) {
+            output[keys[i]] = {
+                code: value,
+            } satisfies Coding;
+        }
+    }
+    return output;
+}
diff --git a/packages/mtb/src/runtime/components/core/MMutationTabGroup.vue b/packages/mtb/src/runtime/components/core/MMutationTabGroup.vue
index 46f253ad..229a8a7b 100644
--- a/packages/mtb/src/runtime/components/core/MMutationTabGroup.vue
+++ b/packages/mtb/src/runtime/components/core/MMutationTabGroup.vue
@@ -1,45 +1,16 @@
 <script lang="ts">
+import { DFormSelectSearch } from '@dnpm-dip/core';
 import type { FormSelectOption } from '@vuecs/form-controls';
-import { defineComponent, markRaw, ref } from 'vue';
-import type {
-    PropType,
-    Ref,
+import {
+    type PropType, type Ref, computed, watch,
 } from 'vue';
-import { DFormSelectSearch } from '@dnpm-dip/core';
-import type { QueryCNVCriteria, QueryFusionCriteria, QuerySNVCriteria } from '../../domains';
+import {
+    defineComponent, markRaw, ref, toRef,
+} from 'vue';
+import { FormMutationType, type MutationDefinition } from '../../domains';
 import MSearchCNVForm from './MSearchCNVForm.vue';
-import MSearchSNVForm from './MSearchSNVForm.vue';
 import MSearchFusionForm from './MSearchFusionForm.vue';
-
-enum MutationType {
-    SNV = 'snv',
-    CNV = 'cnv',
-    DNA_FUSION = 'dnaFusion',
-    RNA_FUSION = 'rnaFusion',
-}
-
-type MutationSNVDefinition = {
-    type: MutationType.SNV,
-    data: QuerySNVCriteria<string>
-};
-
-type MutationCNVDefinition = {
-    type: MutationType.CNV,
-    data: QueryCNVCriteria<string>
-};
-
-type MutationDNAFusionDefinition = {
-    type: MutationType.DNA_FUSION,
-    data: QueryFusionCriteria<string>
-};
-
-type MutationRNAFusionDefinition = {
-    type: MutationType.RNA_FUSION,
-    data: QueryFusionCriteria<string>
-};
-
-type MutationDefinition = MutationSNVDefinition | MutationCNVDefinition |
-MutationDNAFusionDefinition | MutationRNAFusionDefinition;
+import MSearchSNVForm from './MSearchSNVForm.vue';
 
 export default defineComponent({
     components: { DFormSelectSearch },
@@ -50,27 +21,28 @@ export default defineComponent({
         },
     },
     setup(props, { emit }) {
+        const entityRef = toRef(props, 'entity');
+
         const options : FormSelectOption[] = [
-            { id: MutationType.CNV, value: 'CNV' },
-            { id: MutationType.SNV, value: 'SNV' },
-            { id: MutationType.DNA_FUSION, value: 'DNA Fusion' },
-            { id: MutationType.RNA_FUSION, value: 'RNA Fusion' },
+            { id: FormMutationType.CNV, value: 'CNV' },
+            { id: FormMutationType.SNV, value: 'SNV' },
+            { id: FormMutationType.DNA_FUSION, value: 'DNA Fusion' },
+            { id: FormMutationType.RNA_FUSION, value: 'RNA Fusion' },
         ];
 
         const comp = ref(null) as Ref<null | Record<string, any>>;
-        const compType = ref(null);
-        const changeComp = (type: MutationType) => {
+        const changeComp = (type: FormMutationType) => {
             switch (type) {
-                case MutationType.CNV: {
+                case FormMutationType.CNV: {
                     comp.value = markRaw(MSearchCNVForm);
                     break;
                 }
-                case MutationType.SNV: {
+                case FormMutationType.SNV: {
                     comp.value = markRaw(MSearchSNVForm);
                     break;
                 }
-                case MutationType.RNA_FUSION:
-                case MutationType.DNA_FUSION: {
+                case FormMutationType.RNA_FUSION:
+                case FormMutationType.DNA_FUSION: {
                     comp.value = markRaw(MSearchFusionForm);
                     break;
                 }
@@ -88,18 +60,52 @@ export default defineComponent({
             changeComp((event.target as Record<string, any>).value);
         };
 
+        const compData = ref(null);
+        const compType = ref(null);
+
         const init = () => {
-            if (!props.entity) return;
+            if (props.entity) {
+                changeComp(props.entity.type);
+
+                compType.value = props.entity.type;
+                compData.value = props.entity.data;
+                return;
+            }
+
+            compType.value = null;
+            compData.value = null;
+        };
 
-            changeComp(props.entity.type);
+        init();
+
+        watch(entityRef, () => {
+            init();
+        }, { deep: true });
+
+        const isEditing = computed(() => !!props.entity &&
+                !!props.entity.type &&
+                !!props.entity.data);
+
+        const handleUpdated = (data: Record<string, any>) => {
+            compData.value = data;
+
+            emit('updated', {
+                type: compType.value,
+                data: compData.value,
+            });
         };
 
         return {
             changeCompByEvent,
             comp,
+            compData,
             compType,
 
             options,
+
+            handleUpdated,
+
+            isEditing,
         };
     },
 });
@@ -112,12 +118,17 @@ export default defineComponent({
         <template #default>
             <VCFormSelect
                 v-model="compType"
+                :disabled="isEditing"
                 :options="options"
                 @change="changeCompByEvent"
             />
         </template>
     </VCFormGroup>
-    <template v-if="comp">
-        <component :is="comp" />
+    <template v-if="comp && compType">
+        <component
+            :is="comp"
+            :entity="compData"
+            @updated="handleUpdated"
+        />
     </template>
 </template>
diff --git a/packages/mtb/src/runtime/components/core/MSearchCNVForm.vue b/packages/mtb/src/runtime/components/core/MSearchCNVForm.vue
index 040ee4fc..47c9d1e9 100644
--- a/packages/mtb/src/runtime/components/core/MSearchCNVForm.vue
+++ b/packages/mtb/src/runtime/components/core/MSearchCNVForm.vue
@@ -1,28 +1,70 @@
 <script lang="ts">
 import {
-    DCollectionTransform, DFormSelectSearch, DTags, DValueSet, type ValueSetCoding,
+    type CodeSystemConcept,
+    DCodeSystem,
+    DCollectionTransform,
+    DFormSelectSearch,
+    DTags,
+    DValueSet,
+    type ValueSetCoding,
+    transformConceptToFormSelectOption,
 } from '@dnpm-dip/core';
-import { defineComponent, reactive } from 'vue';
+import {
+    type PropType, computed, defineComponent, reactive, toRef, watch,
+} from 'vue';
 import type { QueryCNVCriteria } from '../../domains';
 
 export default defineComponent({
     components: {
-        DTags, DValueSet, DCollectionTransform, DFormSelectSearch,
+        DTags, DCodeSystem, DValueSet, DCollectionTransform, DFormSelectSearch,
+    },
+    props: {
+        entity: Object as PropType<QueryCNVCriteria<string>>,
     },
-    setup() {
+    emits: ['updated'],
+    setup(props, { emit }) {
+        const entityRef = toRef(props, 'entity');
         const form = reactive<QueryCNVCriteria<string>>({
             affectedGenes: [],
             type: '',
         });
 
+        const init = () => {
+            if (!props.entity) return;
+
+            form.affectedGenes = props.entity?.affectedGenes ?? [];
+            form.type = props.entity?.type || '';
+        };
+
+        init();
+
+        watch(entityRef, () => {
+            init();
+        });
+
         const transformCodings = (coding: ValueSetCoding) => ({
             id: coding.code,
             value: coding.display ? `${coding.display}` : coding.code,
         });
 
+        const transformConcepts = (
+            concept: CodeSystemConcept,
+        ) => transformConceptToFormSelectOption(concept);
+
+        const isEditing = computed(() => !!entityRef.value);
+        const submit = () => {
+            emit('updated', {
+                affectedGenes: form.affectedGenes,
+                type: form.type,
+            } satisfies QueryCNVCriteria<string>);
+        };
+
         return {
             form,
             transformCodings,
+            transformConcepts,
+            isEditing,
+            submit,
         };
     },
 });
@@ -74,14 +116,14 @@ export default defineComponent({
             Gene
         </template>
         <template #default>
-            <DValueSet
+            <DCodeSystem
                 :code="'https://www.genenames.org/'"
                 :lazy-load="true"
             >
                 <template #default="{ data }">
                     <DCollectionTransform
-                        :items="data.codings"
-                        :transform="transformCodings"
+                        :items="data.concepts"
+                        :transform="transformConcepts"
                     >
                         <template #default="options">
                             <DFormSelectSearch
@@ -108,7 +150,17 @@ export default defineComponent({
                         placeholder="HGNC"
                     />
                 </template>
-            </DValueSet>
+            </DCodeSystem>
         </template>
     </VCFormGroup>
+    <div>
+        <button
+            :disabled="busy"
+            type="button"
+            class="btn btn-secondary btn-xs"
+            @click.prevent="submit()"
+        >
+            {{ isEditing ? 'Aktualisiern' : 'Hinzufügen' }}
+        </button>
+    </div>
 </template>
diff --git a/packages/mtb/src/runtime/components/core/MSearchForm.vue b/packages/mtb/src/runtime/components/core/MSearchForm.vue
index b5e13a5a..a766943a 100644
--- a/packages/mtb/src/runtime/components/core/MSearchForm.vue
+++ b/packages/mtb/src/runtime/components/core/MSearchForm.vue
@@ -1,22 +1,29 @@
 <script lang="ts">
 import {
-    type CodeSystemConcept,
     DCollectionTransform,
-    DFormSelectSearch, DFormTabGroups,
+    DFormSelectSearch,
+    DFormTabGroups,
     DTags,
     DValueSet,
-    type ValueSetCoding,
-} from '@dnpm-dip/core';
-import {
     QueryRequestMode,
+    type ValueSetCoding,
+    buildCodingsRecord,
+    extractCodeFromCodingsRecord,
+    transformCodingsToFormSelectOptions,
+    transformFormSelectOptionsToCodings,
 } from '@dnpm-dip/core';
 import type { FormSelectOption } from '@vuecs/form-controls';
 import type { PropType } from 'vue';
-import {
-    defineComponent, ref,
-} from 'vue';
+import { defineComponent, ref } from 'vue';
 import { useMTBAPIClient } from '#imports';
-import type { QueryCriteria } from '../../domains';
+import {
+    FormMutationType,
+    type MutationDefinition,
+    type QueryCNVCriteria,
+    type QueryCriteria,
+    type QueryFusionCriteria,
+    type QuerySNVCriteria,
+} from '../../domains';
 import MMutationTabGroup from './MMutationTabGroup.vue';
 
 export default defineComponent({
@@ -57,9 +64,12 @@ export default defineComponent({
         const busy = ref(false);
         const criteria = ref<QueryCriteria>({});
 
-        const mutations = ref([]);
+        // todo: this is complex
+        const mutations = ref<MutationDefinition[]>([]);
+
         const diagnoses = ref<FormSelectOption[]>([]);
         const tumorMorphologies = ref<FormSelectOption[]>([]);
+
         const responses = ref<FormSelectOption[]>([]);
 
         const reset = async () => {
@@ -73,9 +83,130 @@ export default defineComponent({
                 mode.value = props.queryMode;
             }
 
+            if (criteria.value.diagnoses) {
+                diagnoses.value = transformCodingsToFormSelectOptions(criteria.value.diagnoses);
+            }
+
+            if (criteria.value.tumorMorphologies) {
+                tumorMorphologies.value = transformCodingsToFormSelectOptions(criteria.value.tumorMorphologies);
+            }
+
+            if (criteria.value.responses) {
+                responses.value = transformCodingsToFormSelectOptions(criteria.value.responses);
+            }
+
+            mutations.value = [];
+
+            if (criteria.value.simpleVariants) {
+                for (let i = 0; i < criteria.value.simpleVariants.length; i++) {
+                    mutations.value.push({
+                        type: FormMutationType.SNV,
+                        data: extractCodeFromCodingsRecord(criteria.value.simpleVariants[i]),
+                    });
+                }
+            }
+
+            if (criteria.value.copyNumberVariants) {
+                for (let i = 0; i < criteria.value.copyNumberVariants.length; i++) {
+                    mutations.value.push({
+                        type: FormMutationType.SNV,
+                        data: extractCodeFromCodingsRecord(criteria.value.copyNumberVariants[i]),
+                    });
+                }
+            }
+
+            if (criteria.value.dnaFusions) {
+                for (let i = 0; i < criteria.value.dnaFusions.length; i++) {
+                    mutations.value.push({
+                        type: FormMutationType.DNA_FUSION,
+                        data: extractCodeFromCodingsRecord(criteria.value.dnaFusions[i]),
+                    });
+                }
+            }
+
+            if (criteria.value.rnaFusions) {
+                for (let i = 0; i < criteria.value.rnaFusions.length; i++) {
+                    mutations.value.push({
+                        type: FormMutationType.RNA_FUSION,
+                        data: extractCodeFromCodingsRecord(criteria.value.rnaFusions[i]),
+                    });
+                }
+            }
+
             busy.value = false;
         };
 
+        const buildCriteria = () : QueryCriteria => {
+            const payload : QueryCriteria = {};
+
+            if (
+                diagnoses.value &&
+                diagnoses.value.length > 0
+            ) {
+                payload.diagnoses = transformFormSelectOptionsToCodings(diagnoses.value);
+            }
+
+            if (
+                tumorMorphologies.value &&
+                tumorMorphologies.value.length > 0
+            ) {
+                payload.tumorMorphologies = transformFormSelectOptionsToCodings(tumorMorphologies.value);
+            }
+
+            if (
+                responses.value &&
+                responses.value.length > 0
+            ) {
+                payload.responses = transformFormSelectOptionsToCodings(responses.value);
+            }
+
+            const snv : QuerySNVCriteria[] = [];
+            const cnv : QueryCNVCriteria[] = [];
+            const dnaFusions : QueryFusionCriteria[] = [];
+            const rnaFusions : QueryFusionCriteria[] = [];
+
+            for (let i = 0; i < mutations.value.length; i++) {
+                const mutation = mutations.value[i];
+
+                switch (mutation.type) {
+                    case FormMutationType.CNV: {
+                        cnv.push(buildCodingsRecord(mutation.data));
+                        break;
+                    }
+                    case FormMutationType.SNV: {
+                        snv.push(buildCodingsRecord(mutation.data));
+                        break;
+                    }
+                    case FormMutationType.DNA_FUSION: {
+                        dnaFusions.push(buildCodingsRecord(mutation.data));
+                        break;
+                    }
+                    case FormMutationType.RNA_FUSION: {
+                        rnaFusions.push(buildCodingsRecord(mutation.data));
+                        break;
+                    }
+                }
+            }
+
+            if (cnv.length > 0) {
+                payload.copyNumberVariants = cnv;
+            }
+
+            if (snv.length > 0) {
+                payload.simpleVariants = snv;
+            }
+
+            if (dnaFusions.length > 0) {
+                payload.dnaFusions = dnaFusions;
+            }
+
+            if (rnaFusions.length > 0) {
+                payload.rnaFusions = rnaFusions;
+            }
+
+            return payload;
+        };
+
         expose({
             reset,
         });
@@ -88,7 +219,7 @@ export default defineComponent({
 
             busy.value = true;
 
-            const payload = {};
+            const payload = buildCriteria();
 
             try {
                 let query : any;
@@ -126,11 +257,6 @@ export default defineComponent({
             value: coding.display ? `${coding.code}: ${coding.display}` : coding.code,
         });
 
-        const transformConcepts = (concept: CodeSystemConcept) => ({
-            id: concept.code,
-            value: `${concept.properties.Symbol}: ${concept.display}`,
-        });
-
         return {
             mutations,
             diagnoses,
@@ -145,7 +271,6 @@ export default defineComponent({
             submit,
 
             transformCodings,
-            transformConcepts,
         };
     },
 });
@@ -157,12 +282,12 @@ export default defineComponent({
                 <h6><i class="fa fa-dna" /> Alteration</h6>
                 <DFormTabGroups
                     v-model="mutations"
-                    :min-items="1"
+                    :min-items="0"
                     :max-items="6"
                 >
                     <template #default="props">
                         <MMutationTabGroup
-                            :entity="props.entity"
+                            :entity="props.item"
                             @updated="props.updated"
                         />
                     </template>
@@ -322,7 +447,6 @@ export default defineComponent({
                                     >
                                         <template #default="options">
                                             <DFormSelectSearch
-                                                v-model="responses"
                                                 :multiple="true"
                                                 :options="options"
                                                 placeholder="..."
@@ -366,7 +490,6 @@ export default defineComponent({
                                     >
                                         <template #default="options">
                                             <DFormSelectSearch
-                                                v-model="responses"
                                                 :multiple="true"
                                                 :options="options"
                                                 placeholder="..."
diff --git a/packages/mtb/src/runtime/components/core/MSearchFusionForm.vue b/packages/mtb/src/runtime/components/core/MSearchFusionForm.vue
index 064d41a4..f03944b9 100644
--- a/packages/mtb/src/runtime/components/core/MSearchFusionForm.vue
+++ b/packages/mtb/src/runtime/components/core/MSearchFusionForm.vue
@@ -1,28 +1,61 @@
 <script lang="ts">
 import {
-    DCollectionTransform, DFormSelectSearch, DTags, DValueSet, type ValueSetCoding,
+    type CodeSystemConcept,
+    DCodeSystem,
+    DCollectionTransform,
+    DFormSelectSearch,
+    DTags,
+    transformConceptToFormSelectOption,
 } from '@dnpm-dip/core';
-import { defineComponent, reactive } from 'vue';
+import {
+    type PropType, computed, defineComponent, reactive, toRef, watch,
+} from 'vue';
 import type { QueryFusionCriteria } from '../../domains';
 
 export default defineComponent({
     components: {
-        DTags, DValueSet, DCollectionTransform, DFormSelectSearch,
+        DTags, DCodeSystem, DCollectionTransform, DFormSelectSearch,
+    },
+    props: {
+        entity: Object as PropType<QueryFusionCriteria<string>>,
     },
-    setup() {
+    setup(props, { emit }) {
+        const entityRef = toRef(props, 'entity');
         const form = reactive<QueryFusionCriteria<string>>({
             fusionPartner3pr: '',
             fusionPartner5pr: '',
         });
 
-        const transformCodings = (coding: ValueSetCoding) => ({
-            id: coding.code,
-            value: coding.display ? `${coding.code}: ${coding.display}` : coding.code,
+        const init = () => {
+            if (!props.entity) return;
+
+            form.fusionPartner3pr = props.entity?.fusionPartner3pr || '';
+            form.fusionPartner5pr = props.entity?.fusionPartner5pr || '';
+        };
+
+        init();
+
+        watch(entityRef, () => {
+            init();
         });
 
+        const transformConcepts = (
+            concept: CodeSystemConcept,
+        ) => transformConceptToFormSelectOption(concept);
+
+        const isEditing = computed(() => !!entityRef.value);
+        const submit = () => {
+            emit('updated', {
+                fusionPartner3pr: form.fusionPartner3pr,
+                fusionPartner5pr: form.fusionPartner5pr,
+            } satisfies QueryFusionCriteria<string>);
+        };
+
         return {
             form,
-            transformCodings,
+            transformConcepts,
+            isEditing,
+            submit,
         };
     },
 });
@@ -33,14 +66,14 @@ export default defineComponent({
             3'-Gene
         </template>
         <template #default>
-            <DValueSet
+            <DCodeSystem
                 :code="'https://www.genenames.org/'"
                 :lazy-load="true"
             >
                 <template #default="{ data }">
                     <DCollectionTransform
-                        :items="data.codings"
-                        :transform="transformCodings"
+                        :items="data.concepts"
+                        :transform="transformConcepts"
                     >
                         <template #default="options">
                             <DFormSelectSearch
@@ -66,7 +99,7 @@ export default defineComponent({
                         placeholder="HGNC"
                     />
                 </template>
-            </DValueSet>
+            </DCodeSystem>
         </template>
     </VCFormGroup>
     <VCFormGroup>
@@ -74,14 +107,14 @@ export default defineComponent({
             5'-Gene
         </template>
         <template #default>
-            <DValueSet
+            <DCodeSystem
                 :code="'https://www.genenames.org/'"
                 :lazy-load="true"
             >
                 <template #default="{ data }">
                     <DCollectionTransform
-                        :items="data.codings"
-                        :transform="transformCodings"
+                        :items="data.concepts"
+                        :transform="transformConcepts"
                     >
                         <template #default="options">
                             <DFormSelectSearch
@@ -107,7 +140,17 @@ export default defineComponent({
                         placeholder="HGNC"
                     />
                 </template>
-            </DValueSet>
+            </DCodeSystem>
         </template>
     </VCFormGroup>
+    <div>
+        <button
+            :disabled="busy"
+            type="button"
+            class="btn btn-secondary btn-xs"
+            @click.prevent="submit()"
+        >
+            {{ isEditing ? 'Aktualisiern' : 'Hinzufügen' }}
+        </button>
+    </div>
 </template>
diff --git a/packages/mtb/src/runtime/components/core/MSearchSNVForm.vue b/packages/mtb/src/runtime/components/core/MSearchSNVForm.vue
index 05fa230d..e090d4fd 100644
--- a/packages/mtb/src/runtime/components/core/MSearchSNVForm.vue
+++ b/packages/mtb/src/runtime/components/core/MSearchSNVForm.vue
@@ -1,29 +1,60 @@
 <script lang="ts">
 import {
-    DCollectionTransform, DFormSelectSearch, DTags, DValueSet, type ValueSetCoding,
+    type CodeSystemConcept,
+    DCodeSystem, DCollectionTransform, DFormSelectSearch, DTags, type ValueSetCoding, transformConceptToFormSelectOption,
 } from '@dnpm-dip/core';
-import { defineComponent, reactive } from 'vue';
+import {
+    type PropType, computed, defineComponent, reactive, toRef, watch,
+} from 'vue';
 import type { QuerySNVCriteria } from '../../domains';
 
 export default defineComponent({
     components: {
-        DTags, DValueSet, DCollectionTransform, DFormSelectSearch,
+        DTags, DCodeSystem, DCollectionTransform, DFormSelectSearch,
+    },
+    props: {
+        entity: Object as PropType<QuerySNVCriteria<string>>,
     },
-    setup() {
+    setup(props, { emit }) {
+        const entityRef = toRef(props, 'entity');
         const form = reactive<QuerySNVCriteria<string>>({
             gene: '',
             dnaChange: '',
             proteinChange: '',
         });
 
-        const transformCodings = (coding: ValueSetCoding) => ({
-            id: coding.code,
-            value: coding.display ? `${coding.code}: ${coding.display}` : coding.code,
+        const init = () => {
+            if (!props.entity) return;
+
+            form.gene = props.entity?.gene || '';
+            form.dnaChange = props.entity?.dnaChange || '';
+            form.proteinChange = props.entity?.proteinChange || '';
+        };
+
+        init();
+
+        watch(entityRef, () => {
+            init();
         });
 
+        const transformConcepts = (
+            concept: CodeSystemConcept,
+        ) => transformConceptToFormSelectOption(concept);
+
+        const isEditing = computed(() => !!entityRef.value);
+        const submit = () => {
+            emit('updated', {
+                gene: form.gene,
+                dnaChange: form.dnaChange,
+                proteinChange: form.proteinChange,
+            } satisfies QuerySNVCriteria<string>);
+        };
+
         return {
             form,
-            transformCodings,
+            transformConcepts,
+            isEditing,
+            submit,
         };
     },
 });
@@ -31,14 +62,14 @@ export default defineComponent({
 <template>
     <div class="form-group">
         <label>Gene</label>
-        <DValueSet
+        <DCodeSystem
             :code="'https://www.genenames.org/'"
             :lazy-load="true"
         >
             <template #default="{ data }">
                 <DCollectionTransform
-                    :items="data.codings"
-                    :transform="transformCodings"
+                    :items="data.concepts"
+                    :transform="transformConcepts"
                 >
                     <template #default="options">
                         <DFormSelectSearch
@@ -64,7 +95,7 @@ export default defineComponent({
                     placeholder="HGNC"
                 />
             </template>
-        </DValueSet>
+        </DCodeSystem>
     </div>
     <VCFormGroup>
         <template #label>
@@ -88,4 +119,14 @@ export default defineComponent({
             />
         </template>
     </VCFormGroup>
+    <div>
+        <button
+            :disabled="busy"
+            type="button"
+            class="btn btn-secondary btn-xs"
+            @click.prevent="submit()"
+        >
+            {{ isEditing ? 'Aktualisiern' : 'Hinzufügen' }}
+        </button>
+    </div>
 </template>
diff --git a/packages/mtb/src/runtime/domains/form/constants.ts b/packages/mtb/src/runtime/domains/form/constants.ts
new file mode 100644
index 00000000..13157e09
--- /dev/null
+++ b/packages/mtb/src/runtime/domains/form/constants.ts
@@ -0,0 +1,6 @@
+export enum FormMutationType {
+    SNV = 'snv',
+    CNV = 'cnv',
+    DNA_FUSION = 'dnaFusion',
+    RNA_FUSION = 'rnaFusion',
+}
diff --git a/packages/mtb/src/runtime/domains/form/index.ts b/packages/mtb/src/runtime/domains/form/index.ts
new file mode 100644
index 00000000..4fbce956
--- /dev/null
+++ b/packages/mtb/src/runtime/domains/form/index.ts
@@ -0,0 +1,2 @@
+export * from './constants';
+export * from './types';
diff --git a/packages/mtb/src/runtime/domains/form/types.ts b/packages/mtb/src/runtime/domains/form/types.ts
new file mode 100644
index 00000000..0d9a763e
--- /dev/null
+++ b/packages/mtb/src/runtime/domains/form/types.ts
@@ -0,0 +1,22 @@
+import type { QueryCNVCriteria, QueryFusionCriteria, QuerySNVCriteria } from '../query';
+import type { FormMutationType } from './constants';
+
+export type MutationSNVDefinition = {
+    type: FormMutationType.SNV,
+    data: QuerySNVCriteria<string>
+};
+export type MutationCNVDefinition = {
+    type: FormMutationType.CNV,
+    data: QueryCNVCriteria<string>
+};
+export type MutationDNAFusionDefinition = {
+    type: FormMutationType.DNA_FUSION,
+    data: QueryFusionCriteria<string>
+};
+export type MutationRNAFusionDefinition = {
+    type: FormMutationType.RNA_FUSION,
+    data: QueryFusionCriteria<string>
+};
+
+export type MutationDefinition = MutationSNVDefinition | MutationCNVDefinition |
+MutationDNAFusionDefinition | MutationRNAFusionDefinition;
diff --git a/packages/mtb/src/runtime/domains/index.ts b/packages/mtb/src/runtime/domains/index.ts
index a38910e4..348f7173 100644
--- a/packages/mtb/src/runtime/domains/index.ts
+++ b/packages/mtb/src/runtime/domains/index.ts
@@ -1 +1,2 @@
+export * from './form';
 export * from './query';
diff --git a/packages/mtb/src/runtime/domains/query/types.ts b/packages/mtb/src/runtime/domains/query/types.ts
index 02c6575f..7818d50e 100644
--- a/packages/mtb/src/runtime/domains/query/types.ts
+++ b/packages/mtb/src/runtime/domains/query/types.ts
@@ -34,8 +34,8 @@ export type QuerySummary = QuerySummaryBase & {
 };
 
 export type QueryFusionCriteria<V = Coding> = {
-    fusionPartner5pr: V,
-    fusionPartner3pr: V
+    fusionPartner5pr?: V,
+    fusionPartner3pr?: V
 };
 
 export type QuerySNVCriteria<V = Coding> = {
@@ -51,8 +51,8 @@ export type QueryCNVCriteria<V = Coding> = {
 
 export type QueryMedicationCriteria<V = Coding> = {
     operator?: 'and' | 'or',
-    medication: V,
-    usage: V[]
+    drugs: V[],
+    usage: V
 };
 
 export type QueryCriteria = {
@@ -62,7 +62,7 @@ export type QueryCriteria = {
     copyNumberVariants?: QueryCNVCriteria[],
     dnaFusions?: QueryFusionCriteria[],
     rnaFusions?: QueryFusionCriteria[],
-    medications?:QueryMedicationCriteria,
+    medication?:QueryMedicationCriteria,
     responses?: Coding<string>[]
 };
 
diff --git a/packages/rd/src/runtime/components/core/SearchForm.vue b/packages/rd/src/runtime/components/core/SearchForm.vue
index d66f8e74..78dbbeae 100644
--- a/packages/rd/src/runtime/components/core/SearchForm.vue
+++ b/packages/rd/src/runtime/components/core/SearchForm.vue
@@ -315,11 +315,6 @@ export default defineComponent({
             value: coding.display ? `${coding.code}: ${coding.display}` : coding.code,
         });
 
-        const transformConcepts = (concept: CodeSystemConcept) => ({
-            id: concept.code,
-            value: `${concept.properties.Symbol}: ${concept.display}`,
-        });
-
         return {
             mode,
             modeOptions,
@@ -336,7 +331,6 @@ export default defineComponent({
             submit,
 
             transformCodings,
-            transformConcepts,
 
             // eslint-disable-next-line vue/no-dupe-keys
             preparedQueryId,
diff --git a/packages/rd/src/runtime/components/core/VariantFormTabGroup.vue b/packages/rd/src/runtime/components/core/VariantFormTabGroup.vue
index 4d671e0c..c6f24689 100644
--- a/packages/rd/src/runtime/components/core/VariantFormTabGroup.vue
+++ b/packages/rd/src/runtime/components/core/VariantFormTabGroup.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { type CodeSystemConcept } from '@dnpm-dip/core';
+import { type CodeSystemConcept, transformConceptToFormSelectOption } from '@dnpm-dip/core';
 import {
     type PropType, defineComponent, reactive, toRef, watch,
 } from 'vue';
@@ -42,10 +42,9 @@ export default defineComponent({
         const handleUpdated = () => {
             emit('updated', form);
         };
-        const transformConcepts = (concept: CodeSystemConcept) => ({
-            id: concept.code,
-            value: `${concept.properties.Symbol}: ${concept.display}`,
-        });
+        const transformConcepts = (
+            concept: CodeSystemConcept,
+        ) => transformConceptToFormSelectOption(concept);
 
         return {
             form,