diff --git a/src/components/admin/MemberSearchSelect.vue b/src/components/admin/MemberSearchSelect.vue
deleted file mode 100644
index e9013f2..0000000
--- a/src/components/admin/MemberSearchSelect.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-<template>
-  <div class="w-full">
-    <Combobox v-model="selected" :disabled="disabled" multiple>
-      <ComboboxLabel>{{ title }}</ComboboxLabel>
-      <div class="relative mt-1">
-        <ComboboxInput
-          class="rounded-md shadow-sm relative block w-full px-3 py-2 border border-gray-300 focus:border-primary placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-0 focus:z-10 sm:text-sm resize-none"
-          @input="query = $event.target.value"
-        />
-        <ComboboxButton class="absolute inset-y-0 right-0 flex items-center pr-2">
-          <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
-        </ComboboxButton>
-        <TransitionRoot
-          leave="transition ease-in duration-100"
-          leaveFrom="opacity-100"
-          leaveTo="opacity-0"
-          @after-leave="query = ''"
-        >
-          <ComboboxOptions
-            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-none sm:text-sm"
-          >
-            <ComboboxOption v-if="filtered.length === 0" as="template" disabled>
-              <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
-                <span class="font-normal block truncate">Keine Auswahl</span>
-              </li>
-            </ComboboxOption>
-
-            <ComboboxOption
-              v-for="member in filtered"
-              as="template"
-              :key="member.id"
-              :value="member.id"
-              v-slot="{ selected, active }"
-            >
-              <li
-                class="relative cursor-default select-none py-2 pl-10 pr-4"
-                :class="{
-                  'bg-primary text-white': active,
-                  'text-gray-900': !active,
-                }"
-              >
-                <span class="block truncate" :class="{ 'font-medium': selected, 'font-normal': !selected }">
-                  {{ member.firstname }} {{ member.lastname }} {{ member.nameaffix }}
-                </span>
-                <span
-                  v-if="selected"
-                  class="absolute inset-y-0 left-0 flex items-center pl-3"
-                  :class="{ 'text-white': active, 'text-primary': !active }"
-                >
-                  <CheckIcon class="h-5 w-5" aria-hidden="true" />
-                </span>
-              </li>
-            </ComboboxOption>
-          </ComboboxOptions>
-        </TransitionRoot>
-      </div>
-    </Combobox>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { defineComponent, type PropType } from "vue";
-import { mapState, mapActions } from "pinia";
-import {
-  Combobox,
-  ComboboxLabel,
-  ComboboxInput,
-  ComboboxButton,
-  ComboboxOptions,
-  ComboboxOption,
-  TransitionRoot,
-} from "@headlessui/vue";
-import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useMemberStore } from "@/stores/admin/club/member/member";
-import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
-import difference from "lodash.difference";
-</script>
-
-<script lang="ts">
-export default defineComponent({
-  props: {
-    modelValue: {
-      type: Array as PropType<Array<number>>,
-      default: [],
-    },
-    title: String,
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  emits: ["update:model-value", "add:difference", "remove:difference", "add:member", "add:memberByArray"],
-  watch: {
-    modelValue() {
-      if (this.initialLoaded) return;
-      this.initialLoaded = true;
-      this.loadMembersInitial();
-    },
-    query() {
-      this.deferingSearch = true;
-      clearTimeout(this.timer);
-      this.timer = setTimeout(() => {
-        this.deferingSearch = false;
-        this.search();
-      }, 600);
-    },
-  },
-  data() {
-    return {
-      initialLoaded: false as boolean,
-      loading: false as boolean,
-      deferingSearch: false as boolean,
-      timer: undefined as any,
-      query: "" as string,
-      filtered: [] as Array<MemberViewModel>,
-    };
-  },
-  computed: {
-    selected: {
-      get() {
-        return this.modelValue;
-      },
-      set(val: Array<number>) {
-        this.$emit("update:model-value", val);
-        if (this.modelValue.length < val.length) {
-          let diff = difference(val, this.modelValue);
-          if (diff.length != 1) return;
-          this.$emit("add:difference", diff[0]);
-          this.$emit("add:member", this.getMemberFromSearch(diff[0]));
-        } else {
-          let diff = difference(this.modelValue, val);
-          if (diff.length != 1) return;
-          this.$emit("remove:difference", diff[0]);
-        }
-      },
-    },
-  },
-  mounted() {
-    this.loadMembersInitial();
-  },
-  methods: {
-    ...mapActions(useMemberStore, ["searchMembers", "getMembersByIds"]),
-    search() {
-      this.filtered = [];
-      this.loading = true;
-      this.searchMembers(this.query)
-        .then((res) => {
-          this.filtered = res.data;
-        })
-        .catch((err) => {})
-        .finally(() => {
-          this.loading = false;
-        });
-    },
-    getMemberFromSearch(id: number) {
-      return this.filtered.find((f) => f.id == id);
-    },
-    loadMembersInitial() {
-      if (this.modelValue.length == 0) return;
-      this.getMembersByIds(this.modelValue)
-        .then((res) => {
-          this.$emit("add:memberByArray", res.data);
-        })
-        .catch(() => {});
-    },
-  },
-});
-</script>
diff --git a/src/components/admin/club/calendar/CreateCalendarModal.vue b/src/components/admin/club/calendar/CreateCalendarModal.vue
index 7e27380..7cef3bc 100644
--- a/src/components/admin/club/calendar/CreateCalendarModal.vue
+++ b/src/components/admin/club/calendar/CreateCalendarModal.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="w-full md:max-w-md">
     <div class="flex flex-col items-center">
-      <p class="text-xl font-medium">Termin erstellen</p>
+      <p class="text-xl font-medium">Termintyp erstellen</p>
     </div>
     <br />
     <form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreate">
diff --git a/src/components/admin/club/calendar/UpdateCalendarModal.vue b/src/components/admin/club/calendar/UpdateCalendarModal.vue
index 0f06597..4def617 100644
--- a/src/components/admin/club/calendar/UpdateCalendarModal.vue
+++ b/src/components/admin/club/calendar/UpdateCalendarModal.vue
@@ -6,7 +6,7 @@
       @click="deleteCalendar"
     />
     <div class="flex flex-col items-center">
-      <p class="text-xl font-medium">Termin erstellen</p>
+      <p class="text-xl font-medium">Termintyp erstellen</p>
     </div>
     <br />
     <Spinner v-if="loading == 'loading'" class="mx-auto" />
diff --git a/src/components/admin/settings/calendarType/CreateCalendarTypeModal.vue b/src/components/admin/settings/calendarType/CreateCalendarTypeModal.vue
index f25bae0..4e83c1b 100644
--- a/src/components/admin/settings/calendarType/CreateCalendarTypeModal.vue
+++ b/src/components/admin/settings/calendarType/CreateCalendarTypeModal.vue
@@ -49,6 +49,8 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
 import type { CreateCalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
+import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
+import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 </script>
 
 <script lang="ts">
@@ -74,7 +76,7 @@ export default defineComponent({
         type: formData.type.value,
         color: formData.color.value,
         nscdr: formData.nscdr.checked,
-        passphrase: formData.passphrase?.value,
+        passphrase: formData.passphrase.value,
       };
       this.status = "loading";
       this.createCalendarType(createCalendarType)
diff --git a/src/components/public/calendar/ShowCalendarEntryModal.vue b/src/components/public/calendar/ShowCalendarEntryModal.vue
deleted file mode 100644
index 267db82..0000000
--- a/src/components/public/calendar/ShowCalendarEntryModal.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-  <div class="relative w-full md:max-w-md">
-    <div class="flex flex-col items-center">
-      <p class="text-xl font-medium">Termin</p>
-    </div>
-    <br />
-    <div class="flex flex-col gap-4 py-2">
-      <div>
-        <label for="title">Terminart</label>
-        <input type="text" id="title" readonly :value="data.type?.type" />
-      </div>
-      <div>
-        <label for="title">Titel</label>
-        <input type="text" id="title" readonly :value="data.title" />
-      </div>
-      <div>
-        <label for="content">Beschreibung</label>
-        <textarea id="content" class="h-18" readonly :value="data.content"></textarea>
-      </div>
-      <div v-if="data.allDay" class="flex flex-row gap-2 items-center">Der Termin findet ganztägig statt.</div>
-      <div v-if="data.allDay == false" class="flex flex-row gap-2">
-        <div class="w-full">
-          <label for="starttime">Startzeit</label>
-          <input type="datetime-local" id="starttime" readonly :value="formatForDateTimeLocalInput(data.starttime)" />
-        </div>
-        <div class="w-full">
-          <label for="endtime">Endzeit</label>
-          <input
-            ref="endtime"
-            type="datetime-local"
-            id="endtime"
-            readonly
-            :value="formatForDateTimeLocalInput(data.endtime)"
-          />
-        </div>
-      </div>
-      <div v-else class="flex flex-row gap-2">
-        <div class="w-full">
-          <label for="startdate">Startdatum</label>
-          <input type="date" id="startdate" readonly :value="formatForDateInput(data.starttime)" />
-        </div>
-        <div class="w-full">
-          <label for="enddate">Enddatum</label>
-          <input ref="enddate" type="date" id="enddate" readonly :value="formatForDateInput(data.endtime)" />
-        </div>
-      </div>
-      <div>
-        <label for="location">Ort</label>
-        <input type="text" id="location" readonly :value="data.location" />
-      </div>
-    </div>
-
-    <div class="flex flex-row justify-end">
-      <div class="flex flex-row gap-4 py-2">
-        <button primary-outline @click="closeModal">schließen</button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { defineAsyncComponent, defineComponent, markRaw } from "vue";
-import { mapState, mapActions } from "pinia";
-import { useModalStore } from "@/stores/modal";
-import Spinner from "@/components/Spinner.vue";
-</script>
-
-<script lang="ts">
-export default defineComponent({
-  computed: {
-    ...mapState(useModalStore, ["data"]),
-  },
-  methods: {
-    ...mapActions(useModalStore, ["closeModal"]),
-    formatForDateTimeLocalInput(utcDateString: string) {
-      const localDate = new Date(utcDateString);
-
-      const year = localDate.getFullYear();
-      const month = String(localDate.getMonth() + 1).padStart(2, "0");
-      const day = String(localDate.getDate()).padStart(2, "0");
-      const hours = String(localDate.getHours()).padStart(2, "0");
-      const minutes = String(localDate.getMinutes()).padStart(2, "0");
-
-      return `${year}-${month}-${day}T${hours}:${minutes}`;
-    },
-    formatForDateInput(utcDateString: string) {
-      const localDate = new Date(utcDateString);
-
-      const year = localDate.getFullYear();
-      const month = String(localDate.getMonth() + 1).padStart(2, "0");
-      const day = String(localDate.getDate()).padStart(2, "0");
-
-      return `${year}-${month}-${day}`;
-    },
-  },
-});
-</script>
diff --git a/src/stores/admin/club/member/member.ts b/src/stores/admin/club/member/member.ts
index 1e1a30e..af803f5 100644
--- a/src/stores/admin/club/member/member.ts
+++ b/src/stores/admin/club/member/member.ts
@@ -40,16 +40,6 @@ export const useMemberStore = defineStore("member", {
           this.loading = "failed";
         });
     },
-    async getMembersByIds(ids: Array<number>): Promise<AxiosResponse<any, any>> {
-      return await http.get(`/admin/member?ids=${ids.join(",")}&noLimit=true`).then((res) => {
-        return { ...res, data: res.data.members };
-      });
-    },
-    async searchMembers(search: string): Promise<AxiosResponse<any, any>> {
-      return await http.get(`/admin/member?search=${search}&noLimit=true`).then((res) => {
-        return { ...res, data: res.data.members };
-      });
-    },
     fetchMemberByActiveId() {
       this.loadingActive = "loading";
       http
@@ -94,10 +84,10 @@ export const useMemberStore = defineStore("member", {
       this.fetchMembers();
       return result;
     },
-    async printMemberList() {
+    async printMemberList(){
       return http.get(`/admin/member/print/namelist`, {
         responseType: "blob",
       });
-    },
+    }
   },
 });
diff --git a/src/stores/admin/navigation.ts b/src/stores/admin/navigation.ts
index 782e42f..a3f6eeb 100644
--- a/src/stores/admin/navigation.ts
+++ b/src/stores/admin/navigation.ts
@@ -63,7 +63,7 @@ export const useNavigationStore = defineStore("navigation", {
               {
                 key: "settings",
                 title: "Einstellungen",
-                levelDefault: "award",
+                levelDefault: "qualification",
               } as topLevelNavigationModel,
             ]
           : []),
diff --git a/src/views/admin/club/newsletter/NewsletterRecipients.vue b/src/views/admin/club/newsletter/NewsletterRecipients.vue
index 0271704..4e55526 100644
--- a/src/views/admin/club/newsletter/NewsletterRecipients.vue
+++ b/src/views/admin/club/newsletter/NewsletterRecipients.vue
@@ -23,14 +23,63 @@
       </div>
     </div>
 
-    <MemberSearchSelect
-      title="weitere Empfänger suchen"
-      v-model="recipients"
-      :disabled="!can('create', 'club', 'newsletter')"
-      @add:member="(s) => members.push(s)"
-      @add:member-by-array="(s) => members.push(...s)"
-    />
+    <div class="w-full">
+      <Combobox v-model="recipients" :disabled="!can('create', 'club', 'newsletter')" multiple>
+        <ComboboxLabel>weitere Empfänger suchen</ComboboxLabel>
+        <div class="relative mt-1">
+          <ComboboxInput
+            class="rounded-md shadow-sm relative block w-full px-3 py-2 border border-gray-300 focus:border-primary placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-0 focus:z-10 sm:text-sm resize-none"
+            @input="query = $event.target.value"
+          />
+          <ComboboxButton class="absolute inset-y-0 right-0 flex items-center pr-2">
+            <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
+          </ComboboxButton>
+          <TransitionRoot
+            leave="transition ease-in duration-100"
+            leaveFrom="opacity-100"
+            leaveTo="opacity-0"
+            @after-leave="query = ''"
+          >
+            <ComboboxOptions
+              class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-none sm:text-sm"
+            >
+              <ComboboxOption v-if="filtered.length === 0" as="template" disabled>
+                <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
+                  <span class="font-normal block truncate"> Keine Auswahl</span>
+                </li>
+              </ComboboxOption>
 
+              <ComboboxOption
+                v-for="member in filtered"
+                as="template"
+                :key="member.id"
+                :value="member.id"
+                v-slot="{ selected, active }"
+              >
+                <li
+                  class="relative cursor-default select-none py-2 pl-10 pr-4"
+                  :class="{
+                    'bg-primary text-white': active,
+                    'text-gray-900': !active,
+                  }"
+                >
+                  <span class="block truncate" :class="{ 'font-medium': selected, 'font-normal': !selected }">
+                    {{ member.firstname }} {{ member.lastname }} {{ member.nameaffix }}
+                  </span>
+                  <span
+                    v-if="selected"
+                    class="absolute inset-y-0 left-0 flex items-center pl-3"
+                    :class="{ 'text-white': active, 'text-primary': !active }"
+                  >
+                    <CheckIcon class="h-5 w-5" aria-hidden="true" />
+                  </span>
+                </li>
+              </ComboboxOption>
+            </ComboboxOptions>
+          </TransitionRoot>
+        </div>
+      </Combobox>
+    </div>
     <p>Ausgewählte Empfänger</p>
     <div class="flex flex-col gap-2 grow overflow-y-auto">
       <div
@@ -76,7 +125,6 @@ import { useAbilityStore } from "@/stores/ability";
 import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
 import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import cloneDeep from "lodash.clonedeep";
-import MemberSearchSelect from "@/components/admin/MemberSearchSelect.vue";
 </script>
 
 <script lang="ts">
@@ -92,25 +140,36 @@ export default defineComponent({
   data() {
     return {
       query: "" as String,
-      members: [] as Array<MemberViewModel>,
     };
   },
   computed: {
     ...mapWritableState(useNewsletterRecipientsStore, ["recipients", "loading"]),
     ...mapWritableState(useNewsletterStore, ["activeNewsletterObj"]),
+    ...mapState(useMemberStore, ["members"]),
     ...mapState(useQueryStoreStore, ["queries"]),
     ...mapState(useQueryBuilderStore, ["data"]),
     ...mapState(useAbilityStore, ["can"]),
+    filtered(): Array<MemberViewModel> {
+      return this.query === ""
+        ? this.members
+        : this.members.filter((member) =>
+            (member.firstname + " " + member.lastname)
+              .toLowerCase()
+              .replace(/\s+/g, "")
+              .includes(this.query.toLowerCase().replace(/\s+/g, ""))
+          );
+    },
+    sorted(): Array<MemberViewModel> {
+      return this.selected.sort((a, b) => {
+        if (a.lastname < b.lastname) return -1;
+        if (a.lastname > b.lastname) return 1;
+        if (a.firstname < b.firstname) return -1;
+        if (a.firstname > b.firstname) return 1;
+        return 0;
+      });
+    },
     selected(): Array<MemberViewModel> {
-      return this.members
-        .filter((m) => this.recipients.includes(m.id))
-        .sort((a, b) => {
-          if (a.lastname < b.lastname) return -1;
-          if (a.lastname > b.lastname) return 1;
-          if (a.firstname < b.firstname) return -1;
-          if (a.firstname > b.firstname) return 1;
-          return 0;
-        });
+      return this.members.filter((m) => this.recipients.includes(m.id));
     },
     queried(): Array<MemberViewModel> {
       if (this.recipientsByQueryId == "def") return [];
@@ -146,6 +205,7 @@ export default defineComponent({
     },
   },
   mounted() {
+    this.fetchMembers(0, 1000, "", true);
     // this.fetchNewsletterRecipients();
     this.fetchQueries();
     this.loadQuery();
diff --git a/src/views/admin/club/protocol/ProtocolPresence.vue b/src/views/admin/club/protocol/ProtocolPresence.vue
index e5f2c19..47bf089 100644
--- a/src/views/admin/club/protocol/ProtocolPresence.vue
+++ b/src/views/admin/club/protocol/ProtocolPresence.vue
@@ -5,19 +5,64 @@
       &#8634; laden fehlgeschlagen
     </p>
 
-    <MemberSearchSelect
-      title="Anwesende suchen"
-      :model-value="presence.map((p) => p.memberId)"
-      :disabled="!can('create', 'club', 'protocol')"
-      @add:difference="
-        (id: number) =>
-          presence.push({ memberId: id, absent: false, excused: true, protocolId: parseInt(protocolId ?? '') })
-      "
-      @add:member="(s) => members.push(s)"
-      @add:member-by-array="(s) => members.push(...s)"
-      @remove:difference="removeSelected"
-    />
+    <div class="w-full">
+      <Combobox v-model="presence" :disabled="!can('create', 'club', 'protocol')" multiple by="memberId">
+        <ComboboxLabel>Anwesende suchen</ComboboxLabel>
+        <div class="relative mt-1">
+          <ComboboxInput
+            class="rounded-md shadow-sm relative block w-full px-3 py-2 border border-gray-300 focus:border-primary placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-0 focus:z-10 sm:text-sm resize-none"
+            @input="query = $event.target.value"
+          />
+          <ComboboxButton class="absolute inset-y-0 right-0 flex items-center pr-2">
+            <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
+          </ComboboxButton>
+          <TransitionRoot
+            leave="transition ease-in duration-100"
+            leaveFrom="opacity-100"
+            leaveTo="opacity-0"
+            @after-leave="query = ''"
+          >
+            <ComboboxOptions
+              class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-none sm:text-sm"
+            >
+              <ComboboxOption v-if="filtered.length === 0" as="template" disabled>
+                <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
+                  <span class="font-normal block truncate"> Keine Auswahl</span>
+                </li>
+              </ComboboxOption>
 
+              <ComboboxOption
+                v-for="member in filtered"
+                as="template"
+                :key="member.memberId"
+                :value="member"
+                v-slot="{ selected, active }"
+              >
+                <li
+                  class="relative cursor-default select-none py-2 pl-10 pr-4"
+                  :class="{
+                    'bg-primary text-white': active,
+                    'text-gray-900': !active,
+                  }"
+                >
+                  <span class="block truncate" :class="{ 'font-medium': selected, 'font-normal': !selected }">
+                    {{ getMember(member.memberId)?.firstname }} {{ getMember(member.memberId)?.lastname }}
+                    {{ getMember(member.memberId)?.nameaffix }}
+                  </span>
+                  <span
+                    v-if="selected"
+                    class="absolute inset-y-0 left-0 flex items-center pl-3"
+                    :class="{ 'text-white': active, 'text-primary': !active }"
+                  >
+                    <CheckIcon class="h-5 w-5" aria-hidden="true" />
+                  </span>
+                </li>
+              </ComboboxOption>
+            </ComboboxOptions>
+          </TransitionRoot>
+        </div>
+      </Combobox>
+    </div>
     <br />
     <p>Anwesenheit</p>
     <div class="flex flex-col gap-2 grow overflow-y-auto">
@@ -56,11 +101,22 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
+import {
+  Combobox,
+  ComboboxLabel,
+  ComboboxInput,
+  ComboboxButton,
+  ComboboxOptions,
+  ComboboxOption,
+  TransitionRoot,
+} from "@headlessui/vue";
+import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { TrashIcon } from "@heroicons/vue/24/outline";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
+import { useMemberStore } from "@/stores/admin/club/member/member";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { useProtocolPresenceStore } from "@/stores/admin/club/protocol/protocolPresence";
 import { useAbilityStore } from "@/stores/ability";
-import MemberSearchSelect from "@/components/admin/MemberSearchSelect.vue";
-import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 </script>
 
 <script lang="ts">
@@ -71,20 +127,36 @@ export default defineComponent({
   data() {
     return {
       query: "" as String,
-      members: [] as Array<MemberViewModel>,
     };
   },
   computed: {
     ...mapWritableState(useProtocolPresenceStore, ["presence", "loading"]),
+    ...mapState(useMemberStore, ["members"]),
     ...mapState(useAbilityStore, ["can"]),
+    filtered(): Array<{ memberId: number; absent: boolean; excused: boolean; protocolId: number }> {
+      return (
+        this.query === ""
+          ? this.members
+          : this.members.filter((member) =>
+              (member.firstname + " " + member.lastname)
+                .toLowerCase()
+                .replace(/\s+/g, "")
+                .includes(this.query.toLowerCase().replace(/\s+/g, ""))
+            )
+      ).map((m) => ({ memberId: m.id, absent: false, excused: true, protocolId: parseInt(this.protocolId ?? "") }));
+    },
     getMember() {
       return (memberId: number) => {
         return this.members.find((m) => memberId == m.id);
       };
     },
   },
-  mounted() {},
+  mounted() {
+    this.fetchMembers(0, 1000, "", true);
+    // this.fetchProtocolPresence();
+  },
   methods: {
+    ...mapActions(useMemberStore, ["fetchMembers"]),
     ...mapActions(useProtocolPresenceStore, ["fetchProtocolPresence"]),
     removeSelected(id: number) {
       let index = this.presence.findIndex((s) => s.memberId == id);
diff --git a/src/views/admin/settings/calendarType/CalendarTypeEdit.vue b/src/views/admin/settings/calendarType/CalendarTypeEdit.vue
index 83785c1..41f043a 100644
--- a/src/views/admin/settings/calendarType/CalendarTypeEdit.vue
+++ b/src/views/admin/settings/calendarType/CalendarTypeEdit.vue
@@ -58,10 +58,8 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { RouterLink } from "vue-router";
-import type {
-  CalendarTypeViewModel,
-  UpdateCalendarTypeViewModel,
-} from "@/viewmodels/admin/settings/calendarType.models";
+import type { CalendarTypeViewModel, UpdateCalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
+import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
@@ -117,7 +115,7 @@ export default defineComponent({
         type: formData.type.value,
         color: formData.color.value,
         nscdr: formData.nscdr.checked,
-        passphrase: formData.passphrase?.value,
+        passphrase: formData.passphrase.value,
       };
       this.status = "loading";
       this.updateActiveCalendarType(updateCalendarType)
diff --git a/src/views/public/calendar/Calendar.vue b/src/views/public/calendar/Calendar.vue
index 956a34d..0cc8d9d 100644
--- a/src/views/public/calendar/Calendar.vue
+++ b/src/views/public/calendar/Calendar.vue
@@ -73,7 +73,6 @@ export default defineComponent({
         weekText: "KW",
         allDaySlot: false,
         events: this.formattedItems,
-        eventClick: this.eventClick,
       };
     },
   },
@@ -93,12 +92,6 @@ export default defineComponent({
     openLinkModal(e: any) {
       this.openModal(markRaw(defineAsyncComponent(() => import("@/components/public/calendar/CalendarLinkModal.vue"))));
     },
-    eventClick(e: any) {
-      this.openModal(
-        markRaw(defineAsyncComponent(() => import("@/components/public/calendar/ShowCalendarEntryModal.vue"))),
-        this.calendars.find((c) => c.id == e.event.id)
-      );
-    },
   },
 });
 </script>