diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index ecae0f4..9976565 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -219,13 +219,15 @@ const updateItem = async () => {
   let ret = null
 
   if(props.inModal) {
-    ret = await dataStore.updateItem(type,item.value, oldItem.value,true)
+    ret = await useEntities(type).update(item.value.id, item.value, true)
+    emit('returnData', ret)
+    modal.close()
   } else {
-    console.log(item.value)
-    ret = await useEntities(type).update(item.value.id, item.value)//await dataStore.updateItem(type,item.value, oldItem.value)
+    ret = await useEntities(type).update(item.value.id, item.value)
+    emit('returnData', ret)
   }
 
-  emit('returnData', ret)
+
 }
 
 
diff --git a/components/columnRenderings/serviceCategories.vue b/components/columnRenderings/serviceCategories.vue
index 51295f1..8d89a29 100644
--- a/components/columnRenderings/serviceCategories.vue
+++ b/components/columnRenderings/serviceCategories.vue
@@ -10,7 +10,7 @@ const props = defineProps({
 const servicecategories = ref([])
 
 const setup = async () => {
-  servicecategories.value = await useSupabaseSelect("servicecategories")
+  servicecategories.value = await useEntities("servicecategories").select()
 }
 
 setup()