diff --git a/components/DocumentUploadModal.vue b/components/DocumentUploadModal.vue
index 8d84458..700c112 100644
--- a/components/DocumentUploadModal.vue
+++ b/components/DocumentUploadModal.vue
@@ -26,8 +26,12 @@ setup()
 const uploadFiles = async () => {
   uploadInProgress.value = true;
 
+  let fileData = props.fileData
+  delete fileData.typeEnabled
 
-  await useFiles().uploadFiles(props.fileData,  document.getElementById("fileUploadInput").files,[],true)
+
+
+  await useFiles().uploadFiles(fileData,  document.getElementById("fileUploadInput").files,[],true)
 
   uploadInProgress.value = false;
   emit("uploadFinished")
@@ -75,9 +79,10 @@ const uploadFiles = async () => {
             searchable-placeholder="Suchen..."
             :options="availableFiletypes"
             v-model="props.fileData.type"
+            :disabled="!props.fileData.typeEnabled"
         >
           <template #label>
-            <span v-if="props.fileData.type">{{availableFiletypes.find(x => x.id === props.fileData.type).name}}</span>
+            <span v-if="availableFiletypes.find(x => x.id === props.fileData.type)">{{availableFiletypes.find(x => x.id === props.fileData.type).name}}</span>
             <span v-else>Keine Typ ausgewählt</span>
           </template>
         </USelectMenu>
diff --git a/pages/files/index.vue b/pages/files/index.vue
index 9bf8043..57393fd 100644
--- a/pages/files/index.vue
+++ b/pages/files/index.vue
@@ -375,7 +375,7 @@ const selectAll = () => {
       </USelectMenu>
 
 
-      <UButton @click="modal.open(DocumentUploadModal,{fileData: {folder: currentFolder.id}})">+ Datei</UButton>
+      <UButton @click="modal.open(DocumentUploadModal,{fileData: {folder: currentFolder.id, type: currentFolder.standardFiletype, typeEnabled: currentFolder.standardFiletypeIsOptional}})">+ Datei</UButton>
       <UButton
           @click="createFolderModalOpen = true"
           variant="outline"
diff --git a/pages/incomingInvoices/create.vue b/pages/incomingInvoices/create.vue
index d358a53..5ff217b 100644
--- a/pages/incomingInvoices/create.vue
+++ b/pages/incomingInvoices/create.vue
@@ -352,20 +352,30 @@ const createIncomingInvoice = async () => {
                 label="Kostenstelle"
                 class=" mb-3"
             >
-              <USelectMenu
-                  :options="dataStore.getCostCentresComposed"
-                  option-attribute="label"
-                  value-attribute="id"
-                  searchable
-                  :search-attributes="['label']"
-                  searchable-placeholder="Suche..."
-                  v-model="item.costCentre"
-              >
-                <template #label>
-                  {{dataStore.getCostCentresComposed.find(account => account.id === item.costCentre) ? dataStore.getCostCentresComposed.find(account => account.id === item.costCentre).label : "Keine Kostenstelle ausgewählt" }}
-                </template>
+              <InputGroup>
+                <USelectMenu
+                    :options="dataStore.getCostCentresComposed"
+                    option-attribute="label"
+                    value-attribute="id"
+                    searchable
+                    :search-attributes="['label']"
+                    searchable-placeholder="Suche..."
+                    v-model="item.costCentre"
+                >
+                  <template #label>
+                    {{dataStore.getCostCentresComposed.find(account => account.id === item.costCentre) ? dataStore.getCostCentresComposed.find(account => account.id === item.costCentre).label : "Keine Kostenstelle ausgewählt" }}
+                  </template>
+
+                </USelectMenu>
+                <UButton
+                    variant="outline"
+                    color="rose"
+                    v-if="item.costCentre"
+                    icon="i-heroicons-x-mark"
+                    @click="item.costCentre = null"
+                />
+              </InputGroup>
 
-              </USelectMenu>
             </UFormGroup>
 
 
diff --git a/pages/incomingInvoices/edit/[id].vue b/pages/incomingInvoices/edit/[id].vue
index b8a8205..b029af0 100644
--- a/pages/incomingInvoices/edit/[id].vue
+++ b/pages/incomingInvoices/edit/[id].vue
@@ -324,20 +324,29 @@ const updateIncomingInvoice = async () => {
                 label="Kostenstelle"
                 class=" mb-3"
             >
-              <USelectMenu
-                  :options="dataStore.getCostCentresComposed"
-                  option-attribute="label"
-                  value-attribute="id"
-                  searchable
-                  :search-attributes="['label']"
-                  searchable-placeholder="Suche..."
-                  v-model="item.costCentre"
-              >
-                <template #label>
-                  {{dataStore.getCostCentresComposed.find(account => account.id === item.costCentre) ? dataStore.getCostCentresComposed.find(account => account.id === item.costCentre).label : "Keine Kostenstelle ausgewählt" }}
-                </template>
+              <InputGroup>
+                <USelectMenu
+                    :options="dataStore.getCostCentresComposed"
+                    option-attribute="label"
+                    value-attribute="id"
+                    searchable
+                    :search-attributes="['label']"
+                    searchable-placeholder="Suche..."
+                    v-model="item.costCentre"
+                >
+                  <template #label>
+                    {{dataStore.getCostCentresComposed.find(account => account.id === item.costCentre) ? dataStore.getCostCentresComposed.find(account => account.id === item.costCentre).label : "Keine Kostenstelle ausgewählt" }}
+                  </template>
 
-              </USelectMenu>
+                </USelectMenu>
+                <UButton
+                    variant="outline"
+                    color="rose"
+                    v-if="item.costCentre"
+                    icon="i-heroicons-x-mark"
+                    @click="item.costCentre = null"
+                />
+              </InputGroup>
             </UFormGroup>
 
 
diff --git a/pages/support/index.vue b/pages/support/index.vue
index dbbf952..ba014b4 100644
--- a/pages/support/index.vue
+++ b/pages/support/index.vue
@@ -5,8 +5,10 @@ const profileStore = useProfileStore()
 const router = useRouter()
 
 const tickets = ref([])
+const tenants = ref([])
 
 const showClosedTickets = ref(false)
+const selectedTenant = ref(null)
 
 const setup = async () => {
   if(profileStore.currentTenant === 5) {
@@ -14,18 +16,33 @@ const setup = async () => {
   } else {
     tickets.value = (await supabase.from("tickets").select("*,created_by(*), ticketmessages(*)").eq("tenant",profileStore.currentTenant).order("created_at", {ascending: false})).data
   }
+
+  if(profileStore.currentTenant === 5) {
+    tenants.value = (await supabase.from("tenants").select().order("id")).data
+  }
+
+
+
 }
 
 setup()
 
 const filteredRows = computed(() => {
+  let items = tickets.value
 
-  if(showClosedTickets.value) {
-    return tickets.value
-  } else {
-    return tickets.value.filter(i => i.status !== "Geschlossen")
+  if(!showClosedTickets.value) {
+    items = items.filter(i => i.status !== "Geschlossen")
   }
 
+  if(selectedTenant.value) {
+    console.log(selectedTenant.value)
+    console.log(items)
+    console.log(items.filter(i => i.tenant.id === selectedTenant.value))
+    items = items.filter(i => i.tenant.id === selectedTenant.value)
+  }
+
+  return items
+
 })
 
 </script>
@@ -49,6 +66,18 @@ const filteredRows = computed(() => {
         label="Geschlossene Tickets anzeigen"
         v-model="showClosedTickets"
       />
+      <USelectMenu
+          v-if="profileStore.currentTenant === 5"
+        :ui-menu="{ width: 'min-w-max' }"
+        :options="tenants"
+        option-attribute="name"
+        value-attribute="id"
+        v-model="selectedTenant"
+      >
+        <template #label>
+          {{selectedTenant ? tenants.find(i => i.id === selectedTenant).name : "Nicht nach Tenant filtern"}}
+        </template>
+      </USelectMenu>
     </template>
   </UDashboardToolbar>
   <UTable