diff --git a/frontend/components/card/CardDetails.vue b/frontend/components/card/CardDetails.vue
index d8468dce0..55db0238a 100644
--- a/frontend/components/card/CardDetails.vue
+++ b/frontend/components/card/CardDetails.vue
@@ -8,8 +8,8 @@
             {{ $t("components.card_details.header") }}
           </h3>
           <IconEdit
-            @click="openModalEditAboutEvent()"
-            @keydown.enter="openModalEditAboutEvent()"
+            @click="openModalEditTextEvent()"
+            @keydown.enter="openModalEditTextEvent()"
           />
         </div>
         <div v-if="event" class="flex-col space-y-6 py-2">
@@ -51,9 +51,8 @@
 <script setup lang="ts">
 import { useModalHandlers } from "~/composables/useModalHandlers";
 
-const { openModal: openModalEditAboutEvent } = useModalHandlers(
-  "ModalEditAboutEvent"
-);
+const { openModal: openModalEditTextEvent } =
+  useModalHandlers("ModalEditTextEvent");
 const { openModal: openModalOrganizationOverview } = useModalHandlers(
   "ModalOrganizationOverview"
 );
diff --git a/frontend/components/card/about/CardAboutEvent.vue b/frontend/components/card/about/CardAboutEvent.vue
index d37ce990c..71bd28a27 100644
--- a/frontend/components/card/about/CardAboutEvent.vue
+++ b/frontend/components/card/about/CardAboutEvent.vue
@@ -6,8 +6,8 @@
           {{ $t("_global.about") }}
         </h3>
         <IconEdit
-          @click="openModalEditAboutEvent()"
-          @keydown.enter="openModalEditAboutEvent()"
+          @click="openModalEditTextEvent()"
+          @keydown.enter="openModalEditTextEvent()"
         />
       </div>
       <div class="flex-col space-y-3">
@@ -60,9 +60,8 @@
 <script setup lang="ts">
 import { useModalHandlers } from "~/composables/useModalHandlers";
 
-const { openModal: openModalEditAboutEvent } = useModalHandlers(
-  "ModalEditAboutEvent"
-);
+const { openModal: openModalEditTextEvent } =
+  useModalHandlers("ModalEditTextEvent");
 
 const idParam = useRoute().params.id;
 const id = typeof idParam === "string" ? idParam : undefined;
diff --git a/frontend/components/card/about/CardAboutGroup.vue b/frontend/components/card/about/CardAboutGroup.vue
index 8a0a6f2a1..b93e7a8b0 100644
--- a/frontend/components/card/about/CardAboutGroup.vue
+++ b/frontend/components/card/about/CardAboutGroup.vue
@@ -17,8 +17,8 @@
           {{ $t("_global.about") }}
         </h3>
         <IconEdit
-          @click="openModalEditAboutGroup()"
-          @keydown.enter="openModalEditAboutGroup()"
+          @click="openModalEditTextGroup()"
+          @keydown.enter="openModalEditTextGroup()"
         />
       </div>
       <div class="flex-col space-y-3">
@@ -81,9 +81,8 @@
 import { useModalHandlers } from "~/composables/useModalHandlers";
 import { IconMap } from "~/types/icon-map";
 
-const { openModal: openModalEditAboutGroup } = useModalHandlers(
-  "ModalEditAboutGroup"
-);
+const { openModal: openModalEditTextGroup } =
+  useModalHandlers("ModalEditTextGroup");
 
 const idParam = useRoute().params.id;
 const id = typeof idParam === "string" ? idParam : undefined;
diff --git a/frontend/components/card/about/CardAboutOrganization.vue b/frontend/components/card/about/CardAboutOrganization.vue
index 08d34b7a1..1d3448709 100644
--- a/frontend/components/card/about/CardAboutOrganization.vue
+++ b/frontend/components/card/about/CardAboutOrganization.vue
@@ -22,8 +22,8 @@
         </h3>
         <IconEdit
           v-if="userIsSignedIn"
-          @click="openModalEditAboutOrganization"
-          @keydown.enter="openModalEditAboutOrganization"
+          @click="openModalEditTextOrganization"
+          @keydown.enter="openModalEditTextOrganization"
         />
       </div>
       <div class="flex-col space-y-3">
@@ -87,8 +87,8 @@
 import { useModalHandlers } from "~/composables/useModalHandlers";
 import { IconMap } from "~/types/icon-map";
 
-const { openModal: openModalEditAboutOrganization } = useModalHandlers(
-  "ModalEditAboutOrganization"
+const { openModal: openModalEditTextOrganization } = useModalHandlers(
+  "ModalEditTextOrganization"
 );
 
 const { userIsSignedIn } = useUser();
diff --git a/frontend/components/card/get-involved/CardGetInvolvedEvent.vue b/frontend/components/card/get-involved/CardGetInvolvedEvent.vue
index 90e4787f5..9aa3528e8 100644
--- a/frontend/components/card/get-involved/CardGetInvolvedEvent.vue
+++ b/frontend/components/card/get-involved/CardGetInvolvedEvent.vue
@@ -5,7 +5,7 @@
         {{ $t("components._global.participate") }}
       </h3>
       <IconEdit @click="openModal()" @keydown.enter="openModal()" />
-      <ModalEditAboutEvent
+      <ModalEditTextEvent
         v-if="event"
         @closeModal="handleCloseModal"
         :event="event"
@@ -53,7 +53,7 @@ defineProps<{
 }>();
 
 const modals = useModals();
-const modalName = "ModalEditAboutEvent";
+const modalName = "ModalEditTextEvent";
 const modalIsOpen = ref(false);
 
 function openModal() {
diff --git a/frontend/components/card/get-involved/CardGetInvolvedGroup.vue b/frontend/components/card/get-involved/CardGetInvolvedGroup.vue
index a19a50696..4fdfd2377 100644
--- a/frontend/components/card/get-involved/CardGetInvolvedGroup.vue
+++ b/frontend/components/card/get-involved/CardGetInvolvedGroup.vue
@@ -5,7 +5,7 @@
         {{ $t("components._global.get_involved") }}
       </h3>
       <IconEdit @click="openModal()" @keydown.enter="openModal()" />
-      <ModalEditAboutGroup
+      <ModalEditTextGroup
         v-if="group"
         @closeModal="handleCloseModal"
         :group="group"
@@ -52,7 +52,7 @@ defineProps<{
 }>();
 
 const modals = useModals();
-const modalName = "ModalEditAboutGroup";
+const modalName = "ModalEditTextGroup";
 const modalIsOpen = ref(false);
 
 function openModal() {
diff --git a/frontend/components/card/get-involved/CardGetInvolvedOrganization.vue b/frontend/components/card/get-involved/CardGetInvolvedOrganization.vue
index caadfaa2b..f1cbdd9c6 100644
--- a/frontend/components/card/get-involved/CardGetInvolvedOrganization.vue
+++ b/frontend/components/card/get-involved/CardGetInvolvedOrganization.vue
@@ -7,8 +7,8 @@
         </h3>
         <IconEdit
           v-if="userIsSignedIn"
-          @click="openModalEditAboutOrganization()"
-          @keydown.enter="openModalEditAboutOrganization()"
+          @click="openModalEditTextOrganization()"
+          @keydown.enter="openModalEditTextOrganization()"
         />
       </div>
       <div class="flex space-x-2 pt-2 lg:absolute lg:right-0 lg:pt-0">
@@ -31,7 +31,7 @@
           ariaLabel="_global.join_organization_aria_label"
         />
       </div>
-      <ModalEditAboutOrganization
+      <ModalEditTextOrganization
         :organization="organization"
         :description="organization.texts.description"
         :getInvolved="organization.texts.getInvolved"
@@ -81,8 +81,8 @@
 import { useModalHandlers } from "~/composables/useModalHandlers";
 import { IconMap } from "~/types/icon-map";
 
-const { openModal: openModalEditAboutOrganization } = useModalHandlers(
-  "ModalEditAboutOrganization"
+const { openModal: openModalEditTextOrganization } = useModalHandlers(
+  "ModalEditTextOrganization"
 );
 
 const { userIsSignedIn } = useUser();
diff --git a/frontend/components/modal/edit/about/ModalEditAboutEvent.vue b/frontend/components/modal/edit/text/ModalEditTextEvent.vue
similarity index 98%
rename from frontend/components/modal/edit/about/ModalEditAboutEvent.vue
rename to frontend/components/modal/edit/text/ModalEditTextEvent.vue
index 3679582c3..ca478bf55 100644
--- a/frontend/components/modal/edit/about/ModalEditAboutEvent.vue
+++ b/frontend/components/modal/edit/text/ModalEditTextEvent.vue
@@ -80,7 +80,7 @@ async function handleSubmit() {
 }
 
 const modals = useModals();
-const modalName = "ModalEditAboutEvent";
+const modalName = "ModalEditTextEvent";
 let modalIsOpen = computed(() => props.isOpen);
 
 onMounted(() => {
diff --git a/frontend/components/modal/edit/about/ModalEditAboutGroup.vue b/frontend/components/modal/edit/text/ModalEditTextGroup.vue
similarity index 98%
rename from frontend/components/modal/edit/about/ModalEditAboutGroup.vue
rename to frontend/components/modal/edit/text/ModalEditTextGroup.vue
index 785ae1f73..bb562b52e 100644
--- a/frontend/components/modal/edit/about/ModalEditAboutGroup.vue
+++ b/frontend/components/modal/edit/text/ModalEditTextGroup.vue
@@ -80,7 +80,7 @@ async function handleSubmit() {
 }
 
 const modals = useModals();
-const modalName = "ModalEditAboutGroup";
+const modalName = "ModalEditTextGroup";
 let modalIsOpen = computed(() => props.isOpen);
 
 onMounted(() => {
diff --git a/frontend/components/modal/edit/about/ModalEditAboutOrganization.vue b/frontend/components/modal/edit/text/ModalEditTextOrganization.vue
similarity index 98%
rename from frontend/components/modal/edit/about/ModalEditAboutOrganization.vue
rename to frontend/components/modal/edit/text/ModalEditTextOrganization.vue
index ea6473437..a2736df81 100644
--- a/frontend/components/modal/edit/about/ModalEditAboutOrganization.vue
+++ b/frontend/components/modal/edit/text/ModalEditTextOrganization.vue
@@ -49,7 +49,7 @@
 import { useModalHandlers } from "~/composables/useModalHandlers";
 import type { OrganizationUpdateTextFormData } from "~/types/entities/organization";
 
-const modalName = "ModalEditAboutOrganization";
+const modalName = "ModalEditTextOrganization";
 const { handleCloseModal } = useModalHandlers(modalName);
 
 const idParam = useRoute().params.id;
diff --git a/frontend/pages/organizations/[id]/events.vue b/frontend/pages/organizations/[id]/events.vue
index 6ee631907..efad7ed5b 100644
--- a/frontend/pages/organizations/[id]/events.vue
+++ b/frontend/pages/organizations/[id]/events.vue
@@ -29,10 +29,10 @@
     </HeaderAppPage>
     <div v-if="organization.events?.length > 0" class="space-y-3 py-4">
       <CardSearchResultEvent
-        v-for="(u, i) in organization.events"
+        v-for="(e, i) in organization.events"
         :key="i"
+        :event="e"
         :isReduced="true"
-        :event="u"
       />
     </div>
     <EmptyState v-else pageType="events" :permission="false" class="py-4" />
diff --git a/frontend/tests/specs/organizationLogic.test.ts b/frontend/tests/specs/organizationLogic.test.ts
index 895b50625..e2aec413d 100644
--- a/frontend/tests/specs/organizationLogic.test.ts
+++ b/frontend/tests/specs/organizationLogic.test.ts
@@ -1,3 +1,5 @@
+import { describe, it, expect } from "vitest";
+
 // Mock fetchById function and organization data directly.
 const mockFetchById = vi.fn();
 const mockOrganization = { id: "test-uuid", name: "Test Organization" };
@@ -7,3 +9,11 @@ vi.mock("@/components/page/PageBreadcrumbs.vue", () => ({
   fetchById: mockFetchById,
   organization: mockOrganization,
 }));
+
+describe("Organization Logic", () => {
+  it("should fetch organization by ID", () => {
+    const organization = { id: "test-uuid", name: "Test Organization" };
+    expect(organization.id).toBe("test-uuid");
+    expect(organization.name).toBe("Test Organization");
+  });
+});
diff --git a/frontend/types/entities/group.d.ts b/frontend/types/entities/group.d.ts
index 1af6bed4e..4d41019b4 100644
--- a/frontend/types/entities/group.d.ts
+++ b/frontend/types/entities/group.d.ts
@@ -10,7 +10,7 @@ export interface Group {
   organization: Organization;
   createdBy: User;
   iconUrl?: string;
-
+  orgId?: string;
   location: Location;
 
   getInvolvedUrl: string;