From daf25898125ba73b20a842c320d714566d4a7b39 Mon Sep 17 00:00:00 2001
From: Ayaz-Microsoft <v-ayazkhan@microsoft.com>
Date: Tue, 8 Sep 2026 15:18:56 +0530
Subject: [PATCH 1/2] Add formatLabel function to format category labels in
 filter component

---
 App/frontend-app/src/components/filter/filter.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/App/frontend-app/src/components/filter/filter.tsx b/App/frontend-app/src/components/filter/filter.tsx
index dab0652f..24b37bf9 100644
--- a/App/frontend-app/src/components/filter/filter.tsx
+++ b/App/frontend-app/src/components/filter/filter.tsx
@@ -40,6 +40,15 @@ interface FilterProps {
     onFilterCleared: () => void; // New prop to notify parent that filters have been cleared
 }
 
+const formatLabel = (label: string): string => {
+    return label
+        .replace(/([A-Z])/g, ' $1')
+        .replace(/_/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim()
+        .replace(/^./, str => str.toUpperCase());
+}
+
 export function Filter({ 
     className, 
     keywordFilterInfo = {}, 
@@ -142,9 +151,9 @@ export function Filter({
                     openItems={openItems}
                     onToggle={handleAccordionToggle}
                 >
-                    {keywordFilterInfo && Object.entries(keywordFilterInfo).slice(0,10).map(([category, keywords], index) => (
+                    {keywordFilterInfo && Object.entries(keywordFilterInfo).map(([category, keywords], index) => (
                         <AccordionItem key={index} value={index.toString()}>
-                            <AccordionHeader inline>{category}</AccordionHeader>
+                            <AccordionHeader inline>{formatLabel(category)}</AccordionHeader>
                             <AccordionPanel className={classes.accordionPanel}>
                                 {keywords.map((keyword, keywordIndex) => {
                                     const isChecked = selectedKeywords[category]?.includes(keyword) || false;

From a38c738573ef7403bfe1358d9787cbd9dd7122e8 Mon Sep 17 00:00:00 2001
From: Ayaz-Microsoft <v-ayazkhan@microsoft.com>
Date: Thu, 10 Sep 2026 09:35:23 +0530
Subject: [PATCH 2/2] Refactor formatLabel function to improve label formatting
 logic

---
 App/frontend-app/src/components/filter/filter.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/App/frontend-app/src/components/filter/filter.tsx b/App/frontend-app/src/components/filter/filter.tsx
index 24b37bf9..4add7ca6 100644
--- a/App/frontend-app/src/components/filter/filter.tsx
+++ b/App/frontend-app/src/components/filter/filter.tsx
@@ -42,8 +42,9 @@ interface FilterProps {
 
 const formatLabel = (label: string): string => {
     return label
-        .replace(/([A-Z])/g, ' $1')
         .replace(/_/g, ' ')
+        .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+        .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
         .replace(/\s+/g, ' ')
         .trim()
         .replace(/^./, str => str.toUpperCase());