diff --git a/web/src/components/associations/AssociationIndexView.tsx b/web/src/components/associations/AssociationIndexView.tsx
index ce30421..36d0606 100644
--- a/web/src/components/associations/AssociationIndexView.tsx
+++ b/web/src/components/associations/AssociationIndexView.tsx
@@ -6,14 +6,13 @@ import { PageContent } from "@/components/general/PageContent";
 
 const AssociationIndexDefinition = graphql(`
   fragment AssociationIndex on AssociationIndex {
-    ... on AssociationIndex {
-      title
-      seoTitle
-      searchDescription
-      lead
-      body {
-        ...Blocks
-      }
+    __typename
+    title
+    seoTitle
+    searchDescription
+    lead
+    body {
+      ...Blocks
     }
   }
 `);
diff --git a/web/src/components/contact/ContactIndexView.tsx b/web/src/components/contact/ContactIndexView.tsx
index fa7b056..958de7f 100644
--- a/web/src/components/contact/ContactIndexView.tsx
+++ b/web/src/components/contact/ContactIndexView.tsx
@@ -6,14 +6,13 @@ import { PageHeader } from "@/components/general/PageHeader";
 
 const ContactIndexDefinition = graphql(`
   fragment ContactIndex on ContactIndex {
-    ... on ContactIndex {
-      title
-      seoTitle
-      searchDescription
-      lead
-      body {
-        ...Blocks
-      }
+    __typename
+    title
+    seoTitle
+    searchDescription
+    lead
+    body {
+      ...Blocks
     }
   }
 `);
diff --git a/web/src/components/home/HomePageView.tsx b/web/src/components/home/HomePageView.tsx
index f69e7d0..5c5a7bf 100644
--- a/web/src/components/home/HomePageView.tsx
+++ b/web/src/components/home/HomePageView.tsx
@@ -14,10 +14,9 @@ import { NewsList } from "@/components/news/NewsList";
 
 const HomeFragmentDefinition = graphql(`
   fragment Home on HomePage {
-    ... on HomePage {
-      featuredEvents {
-        id
-      }
+    __typename
+    featuredEvents {
+      id
     }
   }
 `);
diff --git a/web/src/components/sponsor/SponsorsPageView.tsx b/web/src/components/sponsor/SponsorsPageView.tsx
index e48e261..ead888b 100644
--- a/web/src/components/sponsor/SponsorsPageView.tsx
+++ b/web/src/components/sponsor/SponsorsPageView.tsx
@@ -6,18 +6,17 @@ import { SponsorList } from "@/components/sponsor/SponsorList";
 
 const SponsorsPageFragmentDefinition = graphql(`
   fragment SponsorsPage on SponsorsPage {
-    ... on SponsorsPage {
-      title
-      seoTitle
-      searchDescription
-      lead
-      body {
-        ...Blocks
-      }
-      sponsors {
-        ... on SponsorBlock {
-          ...Sponsor
-        }
+    __typename
+    title
+    seoTitle
+    searchDescription
+    lead
+    body {
+      ...Blocks
+    }
+    sponsors {
+      ... on SponsorBlock {
+        ...Sponsor
       }
     }
   }
diff --git a/web/src/components/venues/VenueIndexView.tsx b/web/src/components/venues/VenueIndexView.tsx
index b4d2a22..c89ca56 100644
--- a/web/src/components/venues/VenueIndexView.tsx
+++ b/web/src/components/venues/VenueIndexView.tsx
@@ -6,14 +6,13 @@ import { VenueList } from "@/components/venues/VenueList";
 
 const VenueIndexDefinition = graphql(`
   fragment VenueIndex on VenueIndex {
-    ... on VenueIndex {
-      title
-      seoTitle
-      searchDescription
-      lead
-      body {
-        ...Blocks
-      }
+    __typename
+    title
+    seoTitle
+    searchDescription
+    lead
+    body {
+      ...Blocks
     }
   }
 `);
diff --git a/web/src/components/venues/VenueRentalIndexView.tsx b/web/src/components/venues/VenueRentalIndexView.tsx
index 362537c..9646d12 100644
--- a/web/src/components/venues/VenueRentalIndexView.tsx
+++ b/web/src/components/venues/VenueRentalIndexView.tsx
@@ -7,14 +7,13 @@ import { VenueList } from "@/components/venues/VenueList";
 
 const VenueRentalIndexDefinition = graphql(`
   fragment VenueRentalIndex on VenueRentalIndex {
-    ... on VenueRentalIndex {
-      title
-      seoTitle
-      searchDescription
-      lead
-      body {
-        ...Blocks
-      }
+    __typename
+    title
+    seoTitle
+    searchDescription
+    lead
+    body {
+      ...Blocks
     }
   }
 `);