diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index dfa51c8c48..4848f14908 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -57,7 +57,7 @@ onBeforeRouteUpdate(async (to, from) => {
             router.push({ name, params: to.params });
         }
     }
-    if (entityId.value !== from.params.id) await fetch(entityId.value, true);
+    if (entityId.value !== to.params.id) await fetch(to.params.id, true);
 });
 
 async function fetch(id, append = false) {
diff --git a/src/components/ui/CardDescriptorBeta.vue b/src/components/ui/CardDescriptorBeta.vue
index 86f756a7b0..5f9a89d648 100644
--- a/src/components/ui/CardDescriptorBeta.vue
+++ b/src/components/ui/CardDescriptorBeta.vue
@@ -26,7 +26,7 @@ const entity = ref();
         @on-fetch="
             (data) => {
                 entity = data;
-                isLoading = false;
+                emit('onFetch', data);
             }
         "
     />
diff --git a/src/components/ui/VnDescriptor.vue b/src/components/ui/VnDescriptor.vue
index 0aad354484..2e6d98f167 100644
--- a/src/components/ui/VnDescriptor.vue
+++ b/src/components/ui/VnDescriptor.vue
@@ -3,7 +3,6 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useState } from 'src/composables/useState';
 import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';
@@ -32,7 +31,6 @@ const $props = defineProps({
     },
 });
 
-const state = useState();
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 20c61b127a..11dbbe5321 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -6,7 +6,7 @@ import filter from './OrderFilter.js';
 
 <template>
     <VnCard
-        data-key="Order"
+        :data-key="$attrs['data-key'] ?? 'Order'"
         url="Orders"
         :filter="filter"
         :descriptor="OrderDescriptor"
diff --git a/src/pages/Order/Card/OrderDescriptorProxy.vue b/src/pages/Order/Card/OrderDescriptorProxy.vue
index 7b3d1a8713..1dff1b6208 100644
--- a/src/pages/Order/Card/OrderDescriptorProxy.vue
+++ b/src/pages/Order/Card/OrderDescriptorProxy.vue
@@ -16,7 +16,7 @@ const $props = defineProps({
             v-if="$props.id"
             :id="$props.id"
             :summary="OrderSummary"
-            data-key="orderDescriptor"
+            data-key="OrderDescriptor"
         />
     </QPopupProxy>
 </template>