diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index aeabcb96d..b9b70fd92 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -78,8 +78,8 @@ async function insert() {
             <TransitionGroup name="list" tag="div" class="column items-center full-width">
                 <QCard
                     class="q-pa-xs q-mb-sm full-width"
-                    v-for="note in rows"
-                    :key="note.id"
+                    v-for="(note, index) in rows"
+                    :key="note.id ?? index"
                 >
                     <QCardSection horizontal>
                         <VnAvatar
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 008b7e4d9..8aa6e1d62 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -16,7 +16,7 @@ const claimId = computed(() => $props.id || route.params.id);
 
 const claimFilter = {
     where: { claimFk: claimId.value },
-    fields: ['created', 'workerFk', 'text'],
+    fields: ['id', 'created', 'workerFk', 'text'],
     include: {
         relation: 'worker',
         scope: {
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 33d235a5f..8011741ef 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,6 +1,6 @@
 <script setup>
-import { useRoute } from 'vue-router';
 import { computed, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 
@@ -33,20 +33,8 @@ const arrayData = useArrayData('SupplierConsumption', {
 const store = arrayData.store;
 
 const dateRanges = computed(() => {
-    const ranges = {
-        from: null,
-        to: null,
-    };
-
-    if (route.query && route.query.params) {
-        const params = JSON.parse(route.query.params);
-        if (params.from && params.to) {
-            ranges.from = params.from;
-            ranges.to = params.to;
-        }
-    }
-
-    return ranges;
+    const { from, to } = arrayData.store?.userParams || {};
+    return { from, to };
 });
 
 const reportParams = computed(() => ({
@@ -117,7 +105,7 @@ onMounted(async () => {
 <template>
     <Teleport to="#st-actions" v-if="stateStore.isSubToolbarShown()">
         <QBtn
-            :disabled="!dateRanges.from && !dateRanges.to"
+            :disabled="!dateRanges.from || !dateRanges.to || !rows.length"
             color="primary"
             icon-right="picture_as_pdf"
             no-caps
@@ -129,7 +117,7 @@ onMounted(async () => {
             </QTooltip>
         </QBtn>
         <QBtn
-            :disabled="!dateRanges.from && !dateRanges.to"
+            :disabled="!dateRanges.from || !dateRanges.to || !rows.length"
             color="primary"
             icon-right="email"
             no-caps
@@ -140,7 +128,6 @@ onMounted(async () => {
             </QTooltip>
         </QBtn>
     </Teleport>
-
     <QPage class="column items-center q-pa-md">
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
             <QScrollArea class="fit text-grey-8">