diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 9135630..e42bc5e 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -369,7 +369,7 @@ const getAvailableQueryStringData = (keys) => {
           <UCard class="mt-5">
             <Toolbar>
               <UButton
-                  @click="router.push(`/standardEntity/tasks/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
+                  @click="router.push(`/standardEntity/tasks/create?${getAvailableQueryStringData()}`)"
               >
                 + Aufgabe
               </UButton>
@@ -386,7 +386,7 @@ const getAvailableQueryStringData = (keys) => {
           <UCard class="mt-5">
             <Toolbar>
               <UButton
-                  @click="router.push(`/standardEntity/contracts/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
+                  @click="router.push(`/standardEntity/contracts/create?${getAvailableQueryStringData({type: 'confirmationOrders'})}`)"
               >
                 + Vertrag
               </UButton>
diff --git a/pages/standardEntity/[type]/[[mode]]/[[id]].vue b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
index 16c752f..025a24c 100644
--- a/pages/standardEntity/[type]/[[mode]]/[[id]].vue
+++ b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
@@ -68,6 +68,7 @@ setupPage()
       v-else-if="loaded && (mode === 'edit' || mode === 'create')"
       :type="route.params.type"
       :item="item"
+      :mode="mode"
   />
   <EntityList
       v-else-if="loaded && mode === 'list'"