diff --git a/components/Blocks/Accordion/index.tsx b/components/Blocks/Accordion/index.tsx
index 2684fc013..6d1afbd22 100644
--- a/components/Blocks/Accordion/index.tsx
+++ b/components/Blocks/Accordion/index.tsx
@@ -18,7 +18,6 @@ export default function AccordionSection({ accordion, title }: AccordionProps) {
   function handleToggleShowMore() {
     setAllItemsVisible((previousState) => !previousState)
   }
-  console.log("PUP", accordion)
 
   function getClassName(idx: number): string {
     if (!allItemsVisible && idx > 4) {
@@ -28,20 +27,21 @@ export default function AccordionSection({ accordion, title }: AccordionProps) {
     }
     return ""
   }
+
   return (
     <SectionContainer id="faq">
       {title && <SectionHeader textTransform="uppercase" title={title} />}
       <Accordion theme={"light"} variant={"card"}>
-        {accordion.map((acc, idx) => (
+        {accordion.map((acc, idx: number) => (
           <AccordionItem
             key={acc.question + idx}
             title={acc.question}
             className={getClassName(idx)}
           >
-            {/*<JsonToHtml
+            <JsonToHtml
               embeds={acc.answer.embedded_itemsConnection.edges}
-              nodes={acc.answer.json?.children}
-            />*/}
+              nodes={acc.answer.json?.children[0].children}
+            />
           </AccordionItem>
         ))}
       </Accordion>
diff --git a/lib/graphql/Query/ContentPage/ContentPage.graphql b/lib/graphql/Query/ContentPage/ContentPage.graphql
index 64019f99c..cfca3fc0d 100644
--- a/lib/graphql/Query/ContentPage/ContentPage.graphql
+++ b/lib/graphql/Query/ContentPage/ContentPage.graphql
@@ -83,6 +83,10 @@ query GetContentPageRefs($locale: String!, $uid: String!) {
       __typename
       ...Accordion_ContentPageRefs
       ...CardsGrid_ContentPageRefs
+      ...Content_ContentPageRefs
+      ...DynamicContent_ContentPageRefs
+      ...Shortcuts_ContentPageRefs
+      ...TextCols_ContentPageRef
       ...UspGrid_ContentPageRefs
     }
     sidebar {
diff --git a/server/routers/contentstack/schemas/blocks/accordion.ts b/server/routers/contentstack/schemas/blocks/accordion.ts
index f5b5bf5d0..75a34e55c 100644
--- a/server/routers/contentstack/schemas/blocks/accordion.ts
+++ b/server/routers/contentstack/schemas/blocks/accordion.ts
@@ -6,6 +6,7 @@ import { BlocksEnums } from "@/types/enums/blocks"
 
 export const faqSchema = z.array(
   z.object({
+    question: z.string(),
     answer: z.object({
       json: z.any(),
       embedded_itemsConnection: z.object({
@@ -28,7 +29,6 @@ export const faqSchema = z.array(
         ),
       }),
     }),
-    question: z.string(),
   })
 )
 
@@ -93,10 +93,6 @@ export const accordionSchema = z.object({
         }),
       }
     }),
-
-  /*hotel_specific_faq: z.object({
-    questions: faqSchema,
-  }),*/
 })
 
 const actualRefs = z.discriminatedUnion("__typename", [