diff --git a/lib/graphql/Fragments/Blocks/Accordion.graphql b/lib/graphql/Fragments/Blocks/Accordion.graphql
index 9a253ffa8..b47d22917 100644
--- a/lib/graphql/Fragments/Blocks/Accordion.graphql
+++ b/lib/graphql/Fragments/Blocks/Accordion.graphql
@@ -8,6 +8,27 @@
 #import "../HotelPage/Ref.graphql"
 #import "../LoyaltyPage/Ref.graphql"
 
+#import "./Refs/Accordion.graphql"
+
+fragment AccordionBlock on Accordion {
+  __typename
+  title
+  questions {
+    question
+    answer {
+      json
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...ContentPageLink
+          }
+        }
+      }
+    }
+  }
+}
+
 fragment Accordion_ContentPage on ContentPageBlocksAccordion {
   __typename
   accordion {
@@ -26,24 +47,7 @@ fragment GlobalFaq on ContentPageBlocksAccordionBlockFaqGlobalFaq {
     global_faqConnection {
       edges {
         node {
-          ... on Accordion {
-            __typename
-            title
-            questions {
-              question
-              answer {
-                json
-                embedded_itemsConnection {
-                  edges {
-                    node {
-                      __typename
-                      ...ContentPageLink
-                    }
-                  }
-                }
-              }
-            }
-          }
+          ...AccordionBlock
         }
       }
     }
@@ -85,20 +89,7 @@ fragment GlobalFaqRefs on ContentPageBlocksAccordionBlockFaqGlobalFaq {
     global_faqConnection {
       edges {
         node {
-          ... on Accordion {
-            questions {
-              answer {
-                embedded_itemsConnection {
-                  edges {
-                    node {
-                      __typename
-                      ...ContentPageRef
-                    }
-                  }
-                }
-              }
-            }
-          }
+          ...AccordionBlockRefs
         }
       }
     }
diff --git a/lib/graphql/Fragments/Blocks/Refs/Accordion.graphql b/lib/graphql/Fragments/Blocks/Refs/Accordion.graphql
new file mode 100644
index 000000000..8e5d74f21
--- /dev/null
+++ b/lib/graphql/Fragments/Blocks/Refs/Accordion.graphql
@@ -0,0 +1,16 @@
+#import "../../ContentPage/Ref.graphql"
+
+fragment AccordionBlockRefs on Accordion {
+  questions {
+    answer {
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...ContentPageRef
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lib/graphql/Query/ContentPage/ContentPage.graphql b/lib/graphql/Query/ContentPage/ContentPage.graphql
index cfca3fc0d..70cababfd 100644
--- a/lib/graphql/Query/ContentPage/ContentPage.graphql
+++ b/lib/graphql/Query/ContentPage/ContentPage.graphql
@@ -23,17 +23,6 @@ query GetContentPage($locale: String!, $uid: String!) {
       preamble
       ...NavigationLinks
     }
-    blocks {
-      __typename
-      ...Accordion_ContentPage
-      ...CardsGrid_ContentPage
-      ...Content_ContentPage
-      ...DynamicContent_ContentPage
-      ...Shortcuts_ContentPage
-      ...Table_ContentPage
-      ...TextCols_ContentPage
-      ...UspGrid_ContentPage
-    }
     sidebar {
       __typename
       ...ContentSidebar_ContentPage
@@ -52,6 +41,7 @@ query GetContentPageBlocks($locale: String!, $uid: String!) {
   content_page(uid: $uid, locale: $locale) {
     blocks {
       __typename
+      ...Accordion_ContentPage
       ...CardsGrid_ContentPage
       ...Content_ContentPage
       ...DynamicContent_ContentPage
diff --git a/lib/graphql/Query/HotelPage/HotelPage.graphql b/lib/graphql/Query/HotelPage/HotelPage.graphql
index 981d60086..58876f94a 100644
--- a/lib/graphql/Query/HotelPage/HotelPage.graphql
+++ b/lib/graphql/Query/HotelPage/HotelPage.graphql
@@ -3,6 +3,8 @@
 #import "../../Fragments/PageLink/HotelPageLink.graphql"
 #import "../../Fragments/PageLink/LoyaltyPageLink.graphql"
 
+#import "../../Fragments/Blocks/Accordion.graphql"
+
 query GetHotelPage($locale: String!, $uid: String!) {
   hotel_page(locale: $locale, uid: $uid) {
     hotel_page_id
@@ -15,24 +17,7 @@ query GetHotelPage($locale: String!, $uid: String!) {
         __typename
         edges {
           node {
-            ... on Accordion {
-              __typename
-              title
-              questions {
-                question
-                answer {
-                  json
-                  embedded_itemsConnection {
-                    edges {
-                      node {
-                        __typename
-                        ...ContentPageLink
-                      }
-                    }
-                  }
-                }
-              }
-            }
+            ...AccordionBlock
           }
         }
       }
diff --git a/server/routers/contentstack/contentPage/query.ts b/server/routers/contentstack/contentPage/query.ts
index 3894a3c6a..553b5b586 100644
--- a/server/routers/contentstack/contentPage/query.ts
+++ b/server/routers/contentstack/contentPage/query.ts
@@ -34,10 +34,9 @@ export const contentPageQueryRouter = router({
     if (!contentPageRefs) {
       return null
     }
-    //console.log("EYY", contentPageRefs.content_page.blocks[1])
-    //console.log("EYY", contentPageRefs.content_page.blocks[0])
+
     const tags = generatePageTags(contentPageRefs, lang)
-    //console.log("tags", tags)
+
     getContentPageCounter.add(1, { lang, uid })
     console.info(
       "contentstack.contentPage start",
@@ -86,7 +85,7 @@ export const contentPageQueryRouter = router({
       console.error(contentPage.error?.format())
       return null
     }
-    //console.log("HEJ2", contentPage.data.content_page.blocks[0])
+
     const tracking: TrackingSDKPageData = {
       pageId: contentPage.data.content_page.system.uid,
       lang: contentPage.data.content_page.system.locale as Lang,