diff --git a/pages/inventoryitems/[mode]/[[id]].vue b/pages/inventoryitems/[mode]/[[id]].vue
index 3b0a987..0e69d40 100644
--- a/pages/inventoryitems/[mode]/[[id]].vue
+++ b/pages/inventoryitems/[mode]/[[id]].vue
@@ -1,6 +1,7 @@
 <script setup>
 import HistoryDisplay from "~/components/HistoryDisplay.vue";
 import dayjs from "dayjs";
+import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
 
 definePageMeta({
   middleware: "auth"
@@ -22,11 +23,11 @@ const itemInfo = ref({
 
 //Functions
 const setupPage = async () => {
-  if(mode.value === "show" || mode.value === "edit"){
+  if(mode.value === "show"){
     itemInfo.value = await useSupabaseSelectSingle("inventoryitems", route.params.id, "*, vendor(*)")
+  } else if(mode.value === "edit") {
+    itemInfo.value = await useSupabaseSelectSingle("inventoryitems", route.params.id, "*")
   }
-
-  if(mode.value === "edit") itemInfo.value = itemInfo.value
 }
 
 const cancelEditorCreate = () => {
diff --git a/pages/inventoryitems/index.vue b/pages/inventoryitems/index.vue
index 5a7ebfc..d100bae 100644
--- a/pages/inventoryitems/index.vue
+++ b/pages/inventoryitems/index.vue
@@ -68,6 +68,13 @@ defineShortcuts({
 
 const dataStore = useDataStore()
 const router = useRouter()
+const items = ref([])
+
+const setupPage = async () => {
+  items.value = await useSupabaseSelect("inventoryitems","*", "articleNumber")
+}
+
+setupPage()
 
 const templateColumns = [
   {
@@ -92,10 +99,10 @@ const columns = computed(() => templateColumns.filter((column) => selectedColumn
 const searchString = ref('')
 const filteredRows = computed(() => {
   if(!searchString.value) {
-    return dataStore.inventoryitems
+    return items.value
   }
 
-  return dataStore.inventoryitems.filter(product => {
+  return items.value.filter(product => {
     return Object.values(product).some((value) => {
       return String(value).toLowerCase().includes(searchString.value.toLowerCase())
     })