diff --git a/src/content/faq/cardholder.mdx b/src/content/faq/cardholder.mdx
index fecb9a34..e6e53eea 100644
--- a/src/content/faq/cardholder.mdx
+++ b/src/content/faq/cardholder.mdx
@@ -4,7 +4,7 @@ order: 2
 ---
 import Accordion from '../../components/Accordion.astro';
 
-# Cardholder FAQ
+# {frontmatter.title}
 
 <Accordion question="Whom should I contact for help with my account?" expand="true">
   Account holders should reach out to their Agency/Organization Program Coordinator (A/OPC), who will be able to answer most account-related questions.
diff --git a/src/content/faq/government-shutdown.mdx b/src/content/faq/government-shutdown.mdx
index 5220970d..c2587b17 100644
--- a/src/content/faq/government-shutdown.mdx
+++ b/src/content/faq/government-shutdown.mdx
@@ -4,7 +4,7 @@ order: 5
 ---
 import Accordion from '../../components/Accordion.astro';
 
-# Government Shutdown FAQ
+# {frontmatter.title}
 ##  Account Holders
 <Accordion question="Can I use my GSA SmartPay account during a government-wide shutdown?" heading_level="h3" expand="true">
 It depends. Account holders are advised to check with your agency regarding the continued use of GSA SmartPay accounts due to a lapse in funding during a shutdown. You may not be authorized to use your accounts if your agency determines such use does not relate to excepted or exempted activities. 
diff --git a/src/content/faq/merchants.mdx b/src/content/faq/merchants.mdx
index 653b44bd..54b7be79 100644
--- a/src/content/faq/merchants.mdx
+++ b/src/content/faq/merchants.mdx
@@ -5,7 +5,7 @@ order: 4
 import Accordion from '../../components/Accordion.astro';
 
 
-# Merchant FAQ
+# {frontmatter.title}
 
 <Accordion  question="Do I have to accept GSA SmartPay® accounts?" expand="true">
 Merchants that wish to obtain a GSA Multiple Award Schedule (MAS) contract to do business with the government are required to accept GSA SmartPay payment solutions as a method of payment for [micro-purchases](https://www.gsa.gov/buy-through-us/purchasing-programs/gsa-multiple-award-schedule/schedule-buyers/purchase-card-holders).
diff --git a/src/content/faq/program-coordinator.mdx b/src/content/faq/program-coordinator.mdx
index 8b1b4ba2..af11be6e 100644
--- a/src/content/faq/program-coordinator.mdx
+++ b/src/content/faq/program-coordinator.mdx
@@ -4,7 +4,7 @@ order: 3
 ---
 import Accordion from '../../components/Accordion.astro';
 
-# Agency/Organization Program Coordinators (A/OPCs) FAQ
+# {frontmatter.title}
 
 <Accordion  question="How do I connect with other A/OPCs to share ideas and best practices?" expand="true">
 There are several ways to actively participate within the community:
diff --git a/src/content/faq/state-tax.mdx b/src/content/faq/state-tax.mdx
index 1365ccb7..70813f2c 100644
--- a/src/content/faq/state-tax.mdx
+++ b/src/content/faq/state-tax.mdx
@@ -4,7 +4,7 @@ order: 1
 ---
 import Accordion from '../../components/Accordion.astro';
 
-# State Tax FAQ 
+# {frontmatter.title}
 ## Travel
 State sales tax exemption applies primarily to hotels and car rentals and usually does not apply to meals and incidentals.
 
diff --git a/src/pages/faq/[slug].astro b/src/pages/faq/[slug].astro
index 189c415d..57d36683 100644
--- a/src/pages/faq/[slug].astro
+++ b/src/pages/faq/[slug].astro
@@ -30,6 +30,6 @@ const { Content, headings } = await entry.render();
   </div>
 </PageLayout>
 <script >
-  import {handleAccordionSearch, increaseHeadingLevels} from "../../assets/js/faqHelper.js"
+  import {handleAccordionSearch} from "../../assets/js/faqHelper.js"
   handleAccordionSearch();
 </script>
\ No newline at end of file
diff --git a/src/pages/faq/index.astro b/src/pages/faq/index.astro
index 55d8487e..050b580e 100644
--- a/src/pages/faq/index.astro
+++ b/src/pages/faq/index.astro
@@ -3,20 +3,14 @@ import PageLayout from '../../layouts/PageLayout.astro';
 import SideNav from '../../components/SinglePageSideNav.astro'
 import { getCollection} from 'astro:content';
 const pages = await getCollection('faq');
-//console.log(pages)
 pages.sort((a, b) => (a.data.order) - b.data.order)
+
 const content_components = pages.map(async entry => (
-  {...entry, Content: (await entry.render()).Content}
+  {...entry, ...(await entry.render())}
 ))
-
 const entries = await Promise.all(content_components)
-// const sidebar_entries =[{id:'index.astro', slug:'./', data:{title: 'Frequently Asked Questions'}}]
-const headings = [{ slug: 'state-tax-faq', text:"State Tax FAQ"}, 
-{slug:'cardholder-faq',text:'Cardholder FAQ'},
-{slug: 'agencyorganization-program-coordinators-aopcs-faq', text:"A/OPCs FAQ"}, 
-{slug:'merchant-faq',text:'Merchant FAQ'},
-{slug:'government-shutdown-faq',text:'Government Shutdown FAQ'},
-]
+const headings = entries.map(entry => entry.headings[0])
+
 ---
 <PageLayout title="Frequent Asked Questions">
   <SideNav