diff --git a/frontend/stores/data.js b/frontend/stores/data.js
index 1b1febb..738c6b5 100644
--- a/frontend/stores/data.js
+++ b/frontend/stores/data.js
@@ -56,7 +56,7 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect: true,
             historyItemHolder: "task",
-            supabaseSelectWithInformation: "*, plant(*), project(*), customer(*)",
+            selectWithInformation: "*, plant(*), project(*), customer(*)",
             filters: [
                 {
                     name: "Nur Offene Aufgaben",
@@ -164,8 +164,8 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             numberRangeHolder: "customerNumber",
             historyItemHolder: "customer",
-            supabaseSortColumn: "customerNumber",
-            supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*, statementallocations(*)), files(*), events(*)",
+            sortColumn: "customerNumber",
+            selectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*, statementallocations(*)), files(*), events(*)",
             filters: [{
                 name: "Archivierte ausblenden",
                 default: true,
@@ -425,7 +425,7 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect:true,
             historyItemHolder: "contact",
-            supabaseSelectWithInformation: "*, customer(*), vendor(*)",
+            selectWithInformation: "*, customer(*), vendor(*)",
             filters: [{
                 name: "Archivierte ausblenden",
                 default: true,
@@ -565,7 +565,7 @@ export const useDataStore = defineStore('data', () => {
                 "Allgemeines",
                 "Abrechnung"
             ],
-            supabaseSelectWithInformation: "*, customer(*), files(*)",
+            selectWithInformation: "*, customer(*), files(*)",
             templateColumns: [
                 {
                     key: 'contractNumber',
@@ -718,9 +718,9 @@ export const useDataStore = defineStore('data', () => {
             label: "Abwesenheiten",
             labelSingle: "Abwesenheit",
             isStandardEntity: true,
-            supabaseSortColumn:"startDate",
-            supabaseSortAscending: false,
-            supabaseSelectWithInformation: "*",
+            sortColumn:"startDate",
+            sortAscending: false,
+            selectWithInformation: "*",
             historyItemHolder: "absencerequest",
             redirect:true,
             filters:[{
@@ -812,8 +812,8 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect:true,
             historyItemHolder: "plant",
-            supabaseSortColumn:"name",
-            supabaseSelectWithInformation: "*, customer(id,name)",
+            sortColumn:"name",
+            selectWithInformation: "*, customer(id,name)",
             filters: [{
                 name: "Archivierte ausblenden",
                 default: true,
@@ -868,7 +868,7 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Artikel",
             isStandardEntity: true,
             redirect:true,
-            supabaseSelectWithInformation: "*, unit(name)",
+            selectWithInformation: "*, unit(name)",
             historyItemHolder: "product",
             filters: [{
                 name: "Archivierte ausblenden",
@@ -995,8 +995,8 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             historyItemHolder: "project",
             numberRangeHolder: "projectNumber",
-            supabaseSelectWithInformation: "*, customer(id,name), plant(id,name), projecttype(name, id), tasks(*, project(id,name), customer(id,name), plant(id,name)), files(*), createddocuments(*, statementallocations(*)), events(*), times(*, profile(id, fullName))",
-            supabaseSortColumn: "projectNumber",
+            selectWithInformation: "*, customer(id,name), plant(id,name), projecttype(name, id), tasks(*, project(id,name), customer(id,name), plant(id,name)), files(*), createddocuments(*, statementallocations(*)), events(*), times(*, profile(id, fullName))",
+            sortColumn: "projectNumber",
             filters: [
                 {
                     name: "Nur Offene Projekte",
@@ -1135,8 +1135,8 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect:true,
             historyItemHolder: "vehicle",
-            supabaseSortColumn:"licensePlate",
-            supabaseSelectWithInformation: "*, checks(*), files(*)",
+            sortColumn:"licensePlate",
+            selectWithInformation: "*, checks(*), files(*)",
             filters:[{
                 name: "Archivierte ausblenden",
                 default: true,
@@ -1242,8 +1242,8 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             numberRangeHolder: "vendorNumber",
             historyItemHolder: "vendor",
-            supabaseSortColumn: "vendorNumber",
-            supabaseSelectWithInformation: "*, contacts(*)",
+            sortColumn: "vendorNumber",
+            selectWithInformation: "*, contacts(*)",
             filters: [{
                 name: "SEPA nicht erteilt",
                 "filterFunction": function (row) {
@@ -1394,8 +1394,8 @@ export const useDataStore = defineStore('data', () => {
             label: "Lagerplätze",
             labelSingle: "Lagerplatz",
             isStandardEntity: true,
-            supabaseSelectWithInformation: "*, files(*)",
-            supabaseSortColumn: "spaceNumber",
+            selectWithInformation: "*, files(*)",
+            sortColumn: "spaceNumber",
             redirect: true,
             numberRangeHolder: "spaceNumber",
             historyItemHolder: "space",
@@ -1527,7 +1527,7 @@ export const useDataStore = defineStore('data', () => {
             isArchivable: true,
             label: "Dokumente",
             labelSingle: "Dokument",
-            supabaseSelectWithInformation: "*, files(*), statementallocations(*)",
+            selectWithInformation: "*, files(*), statementallocations(*)",
             filters: [
                 {
                     name: "Archivierte ausblenden",
@@ -1564,13 +1564,13 @@ export const useDataStore = defineStore('data', () => {
             isArchivable: true,
             label: "Dateien",
             labelSingle: "Datei",
-            supabaseSelectWithInformation: "*",
+            selectWithInformation: "*",
         },
         folders: {
             isArchivable: true,
             label: "Ordner",
             labelSingle: "Ordner",
-            supabaseSelectWithInformation: "*",
+            selectWithInformation: "*",
         },
         incominginvoices: {
             label: "Eingangsrechnungen",
@@ -1636,7 +1636,7 @@ export const useDataStore = defineStore('data', () => {
             label: "Inventarartikel",
             labelSingle: "Inventarartikel",
             isStandardEntity: true,
-            supabaseSelectWithInformation: "*, files(*), vendor(id,name), currentSpace(id,name)",
+            selectWithInformation: "*, files(*), vendor(id,name), currentSpace(id,name)",
             redirect: true,
             numberRangeHolder: "articleNumber",
             historyItemHolder: "inventoryitem",
@@ -1788,7 +1788,7 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Inventarartikelgruppe",
             isStandardEntity: true,
             historyItemHolder: "inventoryitemgroup",
-            supabaseSelectWithInformation: "*",
+            selectWithInformation: "*",
             redirect: true,
             filters:[{
                 name: "Archivierte ausblenden",
@@ -1856,7 +1856,7 @@ export const useDataStore = defineStore('data', () => {
             label: "Dokumentenboxen",
             labelSingle: "Dokumentenbox",
             isStandardEntity: true,
-            supabaseSelectWithInformation: "*, space(*), files(*)",
+            selectWithInformation: "*, space(*), files(*)",
             redirect: true,
             numberRangeHolder: "key",
             historyItemHolder: "documentbox",
@@ -1921,7 +1921,7 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Leistung",
             isStandardEntity: true,
             redirect: true,
-            supabaseSelectWithInformation: "*, unit(*)",
+            selectWithInformation: "*, unit(*)",
             historyItemHolder: "service",
             filters: [{
                 name: "Archivierte ausblenden",
@@ -2057,7 +2057,7 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Stundensatz",
             isStandardEntity: true,
             redirect: true,
-            supabaseSelectWithInformation: "*",
+            selectWithInformation: "*",
             historyItemHolder: "hourrate",
             filters: [{
                 name: "Archivierte ausblenden",
@@ -2108,7 +2108,7 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Termin",
             isStandardEntity: true,
             historyItemHolder: "event",
-            supabaseSelectWithInformation: "*, project(id,name), customer(*)",
+            selectWithInformation: "*, project(id,name), customer(*)",
             redirect: true,
             filters:[{
                 name: "Archivierte ausblenden",
@@ -2260,8 +2260,8 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Artikelkategorie",
             isStandardEntity: true,
             redirect: true,
-            supabaseSortColumn: "name",
-            supabaseSelectWithInformation: "*",
+            sortColumn: "name",
+            selectWithInformation: "*",
             filters: [{
                 name: "Archivierte ausblenden",
                 default: true,
@@ -2302,8 +2302,8 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Leistungskategorie",
             isStandardEntity: true,
             redirect: true,
-            supabaseSortColumn: "name",
-            supabaseSelectWithInformation: "*",
+            sortColumn: "name",
+            selectWithInformation: "*",
             filters: [{
                 name: "Archivierte ausblenden",
                 default: true,
@@ -2356,7 +2356,7 @@ export const useDataStore = defineStore('data', () => {
             label: "Überprüfungen",
             labelSingle: "Überprüfung",
             isStandardEntity: true,
-            supabaseSelectWithInformation: "*, vehicle(id,licensePlate), profile(id, fullName), inventoryitem(name), files(*)",
+            selectWithInformation: "*, vehicle(id,licensePlate), profile(id, fullName), inventoryitem(name), files(*)",
             redirect: true,
             historyItemHolder: "check",
             filters: [{
@@ -2439,8 +2439,8 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             numberRangeHolder: "number",
             historyItemHolder: "costcentre",
-            supabaseSortColumn: "number",
-            supabaseSelectWithInformation: "*, project(*), vehicle(*), inventoryitem(*)",
+            sortColumn: "number",
+            selectWithInformation: "*, project(*), vehicle(*), inventoryitem(*)",
             filters: [{
                 name: "Archivierte ausblenden",
                 default: true,
@@ -2519,8 +2519,8 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect:true,
             historyItemHolder: "ownaccount",
-            supabaseSortColumn: "number",
-            supabaseSelectWithInformation: "*, statementallocations(*, bs_id(*))",
+            sortColumn: "number",
+            selectWithInformation: "*, statementallocations(*, bs_id(*))",
             filters: [{
                 name: "Archivierte ausblenden",
                 default: true,