diff --git a/components/materialComposing.vue b/components/materialComposing.vue
index 3d21a09..b3c802a 100644
--- a/components/materialComposing.vue
+++ b/components/materialComposing.vue
@@ -2,8 +2,6 @@
 
 import { v4 as uuidv4 } from 'uuid';
 
-const supabase = useSupabaseClient()
-
 const props = defineProps({
   item: {
     type: Object,
@@ -15,8 +13,8 @@ const products = ref([])
 const units = ref([])
 
 const setup = async () => {
-  products.value = await useSupabaseSelect("products")
-  units.value = (await supabase.from("units").select()).data
+  products.value = await useEntities("products").select()
+  units.value = await useEntities("units").selectSpecial()
 }
 
 setup()
diff --git a/components/personalComposing.vue b/components/personalComposing.vue
index 7cb27f5..4873b4d 100644
--- a/components/personalComposing.vue
+++ b/components/personalComposing.vue
@@ -15,8 +15,8 @@ const hourrates = ref([])
 const units = ref([])
 
 const setup = async () => {
-  hourrates.value = await useSupabaseSelect("hourrates")
-  units.value = (await supabase.from("units").select()).data
+  hourrates.value = await useEntities("hourrates").select()
+  units.value = await useEntities("units").selectSpecial()
 }
 
 setup()