diff --git a/eds/blocks/knowledge-base-overview/knowledge-base-overview.js b/eds/blocks/knowledge-base-overview/knowledge-base-overview.js
index 8e77441..28d8896 100644
--- a/eds/blocks/knowledge-base-overview/knowledge-base-overview.js
+++ b/eds/blocks/knowledge-base-overview/knowledge-base-overview.js
@@ -1,4 +1,4 @@
-import { getLibs, replaceText, getConfig } from './../../scripts/utils.js';
+import { getLibs, replaceText, getConfig, populateLocalizedTextFromListItems } from './../../scripts/utils.js';
 import { KnowledgeBaseOverview } from './KnowledgeBaseOverview.js';
 
 function declareKnowledgeBaseOverview() {
@@ -40,6 +40,8 @@ export default async function init(el) {
     '{{search}}': 'Search',
   };
 
+  populateLocalizedTextFromListItems(el, localizedText);
+
   const deps = await Promise.all([
     localizationPromises(localizedText, config),
     import(`${miloLibs}/features/spectrum-web-components/dist/theme.js`),
diff --git a/eds/blocks/partner-news/partner-news.js b/eds/blocks/partner-news/partner-news.js
index 936c5b7..7a2bbd5 100644
--- a/eds/blocks/partner-news/partner-news.js
+++ b/eds/blocks/partner-news/partner-news.js
@@ -1,4 +1,4 @@
-import { getLibs, replaceText, getConfig } from './../../scripts/utils.js';
+import { getLibs, replaceText, getConfig, populateLocalizedTextFromListItems } from './../../scripts/utils.js';
 import { PartnerNews } from './PartnerNews.js';
 
 function declarePartnerNews() {
@@ -38,9 +38,11 @@ export default async function init(el) {
     '{{previous-month}}': 'Previous month',
     '{{results}}': 'Results',
     '{{search}}': 'Search',
-    '{{show-all}}': 'Show all'
+    '{{show-all}}': 'Show all',
   };
 
+  populateLocalizedTextFromListItems(el, localizedText);
+
   const deps = await Promise.all([
     localizationPromises(localizedText, config),
     import(`${miloLibs}/features/spectrum-web-components/dist/theme.js`),
diff --git a/eds/components/PartnerCards.js b/eds/components/PartnerCards.js
index 657e9e8..613ac24 100644
--- a/eds/components/PartnerCards.js
+++ b/eds/components/PartnerCards.js
@@ -123,35 +123,33 @@ export class PartnerCards extends LitElement {
         this.blockData.title = titleEl.innerText.trim();
       },
       'filter': (cols) => {
-        const [filterKeyEl, filterValueEl, filterTagsKeysEl, filterTagsValueEl] = cols;
-        const filterKey = filterKeyEl.innerText.trim().toLowerCase().replaceAll(' ', '-');
-        const filterValue = filterValueEl.innerText.trim();
-        const filterTagsKeys = Array.from(filterTagsKeysEl.querySelectorAll('li'), (li) => li.innerText.trim().toLowerCase());
-        const filterTagsValue = Array.from(filterTagsValueEl.querySelectorAll('li'), (li) => li.innerText.trim());
+        const [filterKeyEl, filterTagsKeysEl] = cols;
+        const filterKey = filterKeyEl.innerText.trim().toLowerCase().replace(/ /g, '-');
+        const filterTagsKeys = Array.from(filterTagsKeysEl.querySelectorAll('li'), (li) => li.innerText.trim().toLowerCase().replace(/ /g, '-'));
 
         if (!filterKey || !filterTagsKeys.length) return;
 
         let filterObj = {
           key: filterKey,
-          value: filterValue,
-          tags: filterTagsKeys.map((tagKey, tagIndex) => ({
-            key: tagKey.replaceAll(' ', '-'),
-            parentKey: filterKey,
-            value: filterTagsValue[tagIndex],
-            checked: false
+          value: this.blockData.localizedText[`{{${filterKey}}}`],
+          tags: filterTagsKeys.map((tagKey) => ({
+              key: tagKey,
+              parentKey: filterKey,
+              value: this.blockData.localizedText[`{{${tagKey}}}`],
+              checked: false
           }))
         };
         this.blockData.filters.push(filterObj);
       },
       'sort': (cols) => {
-        const [sortKeysEl, sortValuesEl] = cols;
-        const sortKeys = Array.from(sortKeysEl.querySelectorAll('li'), (li) => li.innerText.trim().toLowerCase());
-        const sortValues = Array.from(sortValuesEl.querySelectorAll('li'), (li) => li.innerText.trim());
+        const [sortKeysEl] = cols;
+        const sortKeys = Array.from(sortKeysEl.querySelectorAll('li'), (li) => li.innerText.trim().toLowerCase().replace(/ /g, '-'));
 
-        const sortItems = sortKeys.map((sortKey, sortIndex) => ({
-          key: sortKey.endsWith('_default') ? sortKey.slice(0, -8) : sortKey,
-          value: sortValues[sortIndex]
-        }));
+        const sortItems = sortKeys.map((sortKey) => {
+          const key = sortKey.endsWith('_default') ? sortKey.slice(0, -8) : sortKey;
+          const value = this.blockData.localizedText[`{{${key}}}`];
+          return { key, value };
+        });
 
         const defaultKey = sortKeys.find(key => key.endsWith('_default')).slice(0, -8) || sortKeys[0];
         const defaultValue = sortItems.find(e => e.key === defaultKey).value;
@@ -173,7 +171,7 @@ export class PartnerCards extends LitElement {
     const rows = Array.from(this.blockData.tableData);
     rows.forEach((row) => {
       const cols = Array.from(row.children);
-      const rowTitle = cols[0].innerText.trim().toLowerCase().replaceAll(' ', '-');
+      const rowTitle = cols[0].innerText.trim().toLowerCase().replace(/ /g, '-');
       const colsContent = cols.slice(1);
       if (blockDataActions[rowTitle]) blockDataActions[rowTitle](colsContent);
     });
diff --git a/eds/scripts/utils.js b/eds/scripts/utils.js
index 4ac3747..918eead 100644
--- a/eds/scripts/utils.js
+++ b/eds/scripts/utils.js
@@ -55,3 +55,12 @@ export { createTag, localizeLink, getConfig };
 
 const { replaceText } = await import(`${miloLibs}/features/placeholders.js`);
 export { replaceText };
+
+export function populateLocalizedTextFromListItems(el, localizedText) {
+  const liList = Array.from(el.querySelectorAll('li'));
+  liList.forEach(liEl => {
+    let liContent = liEl.innerText.trim().toLowerCase().replace(/ /g, '-');
+    if (liContent.endsWith('_default')) liContent = liContent.slice(0, -8);
+    localizedText[`{{${liContent}}}`] = liContent;
+  });
+}
diff --git a/test/blocks/knowledge-base-overview/mocks/body.html b/test/blocks/knowledge-base-overview/mocks/body.html
index 2f86f56..0635b8b 100644
--- a/test/blocks/knowledge-base-overview/mocks/body.html
+++ b/test/blocks/knowledge-base-overview/mocks/body.html
@@ -2,85 +2,109 @@
   <div>
     <div>Title</div>
     <div>Sample Title for Card Collection</div>
+    <div></div>
+  </div>
+  <div>
+    <div>Cards per page</div>
+    <div>6</div>
+    <div></div>
   </div>
   <div>
     <div>Filter</div>
-    <div>Audience</div>
-    <div>Audience</div>
     <div>
-      <ol>
-        <li>Marketing</li>
-        <li>Sales</li>
-        <li>Practice Lead</li>
-        <li>Technical</li>
-      </ol>
+      <ul>
+        <li>Applications</li>
+      </ul>
     </div>
     <div>
-      <ol>
-        <li>Marketing</li>
-        <li>Sales</li>
-        <li>Practice Lead</li>
-        <li>Technical</li>
-      </ol>
+      <ul>
+        <li>sign</li>
+        <li>advertising-cloud</li>
+        <li>analytics</li>
+        <li>audience-manager</li>
+        <li>campaign</li>
+        <li>commerce</li>
+        <li>customer-journey-analytics</li>
+        <li>document-cloud</li>
+        <li>document-services</li>
+        <li>experience-cloud</li>
+        <li>experience-manager</li>
+        <li>experience-platform</li>
+        <li>journey-optimizer</li>
+        <li>marketo-engage</li>
+        <li>microsoft</li>
+        <li>real-time-cdp</li>
+        <li>target</li>
+        <li>workfront</li>
+      </ul>
     </div>
   </div>
   <div>
     <div>Filter</div>
-    <div>Region</div>
-    <div>Region</div>
     <div>
-      <ol>
-        <li>Americas</li>
-        <li>Asia Pacific</li>
-        <li>EMEA</li>
-        <li>Japan</li>
-      </ol>
+      <ul>
+        <li>audience</li>
+      </ul>
     </div>
     <div>
-      <ol>
-        <li>Americas</li>
-        <li>Asia Pacific</li>
-        <li>Europe, Middle East &#x26; Africa</li>
-        <li>Japan</li>
-      </ol>
+      <ul>
+        <li>marketing</li>
+        <li>sales</li>
+        <li>practice-lead</li>
+        <li>technical</li>
+      </ul>
     </div>
   </div>
   <div>
     <div>Filter</div>
-    <div>product</div>
-    <div>Product</div>
     <div>
-      <ol>
-        <li>adobe-experience-manager</li>
-        <li>adobe-analytics</li>
-        <li>adobe-target</li>
-      </ol>
+      <ul>
+        <li>region</li>
+      </ul>
     </div>
     <div>
-      <ol>
-        <li>Experience manager</li>
-        <li>Analytics</li>
-        <li>Target</li>
-      </ol>
+      <ul>
+        <li>americas</li>
+        <li>asia-pacific</li>
+        <li>emea</li>
+        <li>japan</li>
+      </ul>
     </div>
   </div>
   <div>
-    <div>Sort</div>
+    <div>Filter</div>
     <div>
-      <ol>
-        <li>newest_default</li>
-        <li>oldest</li>
-        <li>a-z</li>
-        <li>z-a</li>
-      </ol>
+      <ul>
+        <li>topic</li>
+      </ul>
     </div>
     <div>
-      <ol>
-        <li>Date: newest</li>
-        <li>Date: oldest</li>
-        <li>Title: A-Z</li>
-        <li>Title: Z-A</li>
-      </ol>
+      <ul>
+        <li>analyst-reports</li>
+        <li>amplify</li>
+        <li>certification-credentials</li>
+        <li>enablement-training</li>
+        <li>events</li>
+        <li>executive-insights</li>
+        <li>industries</li>
+        <li>marketing</li>
+        <li>program-benefits</li>
+        <li>programs-contests</li>
+        <li>product-releases</li>
+        <li>selling</li>
+        <li>solutions</li>
+        <li>specialization</li>
+      </ul>
+    </div>
+  </div>
+  <div>
+    <div>Sort</div>
+    <div>
+      <ul>
+        <li>newest</li>
+        <li>oldest_default</li>
+      </ul>
     </div>
+    <div></div>
   </div>
 </div>
diff --git a/test/blocks/partner-news/mocks/body.html b/test/blocks/partner-news/mocks/body.html
index 0e5cb3f..2468b1a 100644
--- a/test/blocks/partner-news/mocks/body.html
+++ b/test/blocks/partner-news/mocks/body.html
@@ -2,85 +2,109 @@
   <div>
     <div>Title</div>
     <div>Sample Title for Card Collection</div>
+    <div></div>
+  </div>
+  <div>
+    <div>Cards per page</div>
+    <div>6</div>
+    <div></div>
   </div>
   <div>
     <div>Filter</div>
-    <div>Audience</div>
-    <div>Audience</div>
     <div>
-      <ol>
-        <li>Marketing</li>
-        <li>Sales</li>
-        <li>Practice Lead</li>
-        <li>Technical</li>
-      </ol>
+      <ul>
+        <li>Applications</li>
+      </ul>
     </div>
     <div>
-      <ol>
-        <li>Marketing</li>
-        <li>Sales</li>
-        <li>Practice Lead</li>
-        <li>Technical</li>
-      </ol>
+      <ul>
+        <li>sign</li>
+        <li>advertising-cloud</li>
+        <li>analytics</li>
+        <li>audience-manager</li>
+        <li>campaign</li>
+        <li>commerce</li>
+        <li>customer-journey-analytics</li>
+        <li>document-cloud</li>
+        <li>document-services</li>
+        <li>experience-cloud</li>
+        <li>experience-manager</li>
+        <li>experience-platform</li>
+        <li>journey-optimizer</li>
+        <li>marketo-engage</li>
+        <li>microsoft</li>
+        <li>real-time-cdp</li>
+        <li>target</li>
+        <li>workfront</li>
+      </ul>
     </div>
   </div>
   <div>
     <div>Filter</div>
-    <div>Region</div>
-    <div>Region</div>
     <div>
-      <ol>
-        <li>Americas</li>
-        <li>Asia Pacific</li>
-        <li>EMEA</li>
-        <li>Japan</li>
-      </ol>
+      <ul>
+        <li>audience</li>
+      </ul>
     </div>
     <div>
-      <ol>
-        <li>Americas</li>
-        <li>Asia Pacific</li>
-        <li>Europe, Middle East &#x26; Africa</li>
-        <li>Japan</li>
-      </ol>
+      <ul>
+        <li>marketing</li>
+        <li>sales</li>
+        <li>practice-lead</li>
+        <li>technical</li>
+      </ul>
     </div>
   </div>
   <div>
     <div>Filter</div>
-    <div>product</div>
-    <div>Product</div>
     <div>
-      <ol>
-        <li>adobe-experience-manager</li>
-        <li>adobe-analytics</li>
-        <li>adobe-target</li>
-      </ol>
+      <ul>
+        <li>region</li>
+      </ul>
     </div>
     <div>
-      <ol>
-        <li>Experience manager</li>
-        <li>Analytics</li>
-        <li>Target</li>
-      </ol>
+      <ul>
+        <li>americas</li>
+        <li>asia-pacific</li>
+        <li>emea</li>
+        <li>japan</li>
+      </ul>
     </div>
   </div>
   <div>
-    <div>Sort</div>
+    <div>Filter</div>
     <div>
-      <ol>
-        <li>newest_default</li>
-        <li>oldest</li>
-        <li>a-z</li>
-        <li>z-a</li>
-      </ol>
+      <ul>
+        <li>topic</li>
+      </ul>
     </div>
     <div>
-      <ol>
-        <li>Date: newest</li>
-        <li>Date: oldest</li>
-        <li>Title: A-Z</li>
-        <li>Title: Z-A</li>
-      </ol>
+      <ul>
+        <li>analyst-reports</li>
+        <li>amplify</li>
+        <li>certification-credentials</li>
+        <li>enablement-training</li>
+        <li>events</li>
+        <li>executive-insights</li>
+        <li>industries</li>
+        <li>marketing</li>
+        <li>program-benefits</li>
+        <li>programs-contests</li>
+        <li>product-releases</li>
+        <li>selling</li>
+        <li>solutions</li>
+        <li>specialization</li>
+      </ul>
+    </div>
+  </div>
+  <div>
+    <div>Sort</div>
+    <div>
+      <ul>
+        <li>newest</li>
+        <li>oldest_default</li>
+      </ul>
     </div>
+    <div></div>
   </div>
 </div>