From 7f2b7d39a924ef6dc50c9da3d06027312edf434d Mon Sep 17 00:00:00 2001
From: Ihor Masechko <ihormasechko@Ihors-MacBook-Air.local>
Date: Tue, 24 Mar 2026 14:42:58 +0200
Subject: [PATCH 1/4] enhance case studies search for text and taxonomy fields

---
 website/modules/case-studies-page/index.js    |  71 +++++++++++-
 .../services/NavigationService.js             |  19 +++-
 .../services/SearchService.js                 | 104 +++++++++++++++---
 .../case-studies-page/views/index.html        |   2 +-
 .../case-studies-page/infinite-scroll.js      |  61 +++++++++-
 .../case-studies-page/search-handler.js       |   5 +-
 6 files changed, 234 insertions(+), 28 deletions(-)

diff --git a/website/modules/case-studies-page/index.js b/website/modules/case-studies-page/index.js
index d3a070fe..748b3d1d 100644
--- a/website/modules/case-studies-page/index.js
+++ b/website/modules/case-studies-page/index.js
@@ -15,13 +15,74 @@ const buildIndexQuery = function (self, req) {
     .perPage(self.perPage);
   self.filterByIndexPage(query, req.data.page);
 
-  const searchCondition = SearchService.buildSearchCondition(searchTerm);
+  const resolved = req.data.searchRelationships || {};
+  const searchCondition = SearchService.buildSearchCondition(
+    searchTerm,
+    resolved,
+  );
   if (searchCondition) {
     query.and(searchCondition);
   }
   return query;
 };
 
+const runResolveSearchRelationships = async function (self, req) {
+  req.data ||= {};
+  const reqData = req.data;
+  const searchTerm = SearchService.getSearchTerm(req.query || {});
+  if (!searchTerm) {
+    reqData.searchRelationships = {};
+    return;
+  }
+  let resolvedRelationships = {};
+  try {
+    resolvedRelationships = await SearchService.resolveSearchRelationships(
+      searchTerm,
+      self.apos,
+      req,
+    );
+  } catch (error) {
+    self.apos.util.error('Error resolving search relationships:', error);
+  }
+  reqData.searchRelationships = resolvedRelationships;
+};
+
+const runApplyEnhancedSearchResults = async function (self, req) {
+  const reqData = req.data;
+  const searchTerm = SearchService.getSearchTerm(req.query || {});
+  if (!searchTerm) {
+    return;
+  }
+  const queryParams = { ...req.query };
+  delete queryParams.search;
+  const resolved = reqData.searchRelationships || {};
+  const hasRelationshipMatches = Object.keys(resolved).length > 0;
+  if (!hasRelationshipMatches) {
+    return;
+  }
+  const searchCondition = SearchService.buildSearchCondition(
+    searchTerm,
+    resolved,
+  );
+  if (!searchCondition) {
+    return;
+  }
+
+  const piecesQuery = self.pieces
+    .find(req, {})
+    .applyBuildersSafely(queryParams);
+  piecesQuery.and(searchCondition);
+
+  const totalQuery = self.pieces.find(req, {}).applyBuildersSafely(queryParams);
+  totalQuery.and(searchCondition);
+
+  const pieces = await piecesQuery.toArray();
+  const totalPieces = await totalQuery.toCount();
+  reqData.pieces = pieces;
+  reqData.totalPieces = totalPieces;
+  reqData.totalPages = 1;
+};
+
 const runSetupIndexData = async function (self, req) {
   try {
     const tagCounts = await TagCountService.calculateTagCounts(
@@ -92,6 +153,8 @@ module.exports = {
       if (superBeforeIndex) {
         await superBeforeIndex(req);
       }
+      await self.resolveSearchRelationships(req);
+      await self.applyEnhancedSearchResults(req);
       await self.setupIndexData(req);
     };
 
@@ -109,6 +172,12 @@ module.exports = {
       indexQuery(req) {
         return buildIndexQuery(self, req);
       },
+      async resolveSearchRelationships(req) {
+        return await runResolveSearchRelationships(self, req);
+      },
+      async applyEnhancedSearchResults(req) {
+        return await runApplyEnhancedSearchResults(self, req);
+      },
       async setupIndexData(req) {
         return await runSetupIndexData(self, req);
       },
diff --git a/website/modules/case-studies-page/services/NavigationService.js b/website/modules/case-studies-page/services/NavigationService.js
index 74af551c..89944465 100644
--- a/website/modules/case-studies-page/services/NavigationService.js
+++ b/website/modules/case-studies-page/services/NavigationService.js
@@ -71,15 +71,22 @@ class NavigationService {
   }
 
   /**
-   * Applies search filter to query when search param is present
-   * Uses SearchService for safe regex (ReDoS prevention) and array handling
+   * Applies search filter to query when search param is present.
+   * Resolves relationship matches so search covers taxonomy and
+   * partner fields in addition to text fields.
    * @param {Object} filteredQuery - Query object
    * @param {Object} req - Request object
-   * @returns {Object} Modified query
+   * @param {Object} apos - ApostropheCMS instance
+   * @returns {Promise<Object>} Modified query
    */
-  static applySearchFilter(filteredQuery, req) {
+  static async applySearchFilter(filteredQuery, req, apos) {
     const searchTerm = SearchService.getSearchTerm(req.query || {});
-    const searchCondition = SearchService.buildSearchCondition(searchTerm);
+    const resolvedRelationships =
+      await SearchService.resolveSearchRelationships(searchTerm, apos, req);
+    const searchCondition = SearchService.buildSearchCondition(
+      searchTerm,
+      resolvedRelationships,
+    );
     if (!searchCondition) {
       return filteredQuery;
     }
@@ -133,7 +140,7 @@ class NavigationService {
         });
       }
     }
-    return NavigationService.applySearchFilter(filteredQuery, req);
+    return await NavigationService.applySearchFilter(filteredQuery, req, apos);
   }
 
   /**
diff --git a/website/modules/case-studies-page/services/SearchService.js b/website/modules/case-studies-page/services/SearchService.js
index 3062c090..183536e7 100644
--- a/website/modules/case-studies-page/services/SearchService.js
+++ b/website/modules/case-studies-page/services/SearchService.js
@@ -1,17 +1,39 @@
 /**
- * SearchService - Shared search term normalization and safe regex building
+ * SearchService - Search term normalization, safe regex building,
+ * and relationship resolution for case-study search.
  *
- * Used by case-studies-page index query and NavigationService so search
- * behavior and escaping stay consistent and safe (ReDoS prevention).
+ * Used by case-studies-page index query and NavigationService so
+ * search behavior stays consistent (ReDoS prevention, escaping).
  */
 
 const REGEX_ESCAPE = /[$()*+.?[\\\]^{|}]/gu;
 
 const MAX_SEARCH_TERM_LENGTH = 200;
 
+const TEXT_FIELDS = [
+  'title',
+  'portfolioTitle',
+  'descriptor',
+  'objective',
+  'challenge',
+  'solution',
+  'results',
+];
+
+const RELATIONSHIP_CONFIGS = [
+  {
+    module: 'cases-tags',
+    caseStudyFields: ['stackIds', 'industryIds', 'caseStudyTypeIds'],
+  },
+  {
+    module: 'business-partner',
+    caseStudyFields: ['partnerIds'],
+  },
+];
+
 /**
- * Normalizes search param from query (handles missing, array, non-string)
- * @param {Object} queryParams - Request query object (e.g. req.query)
+ * Normalizes search param from query
+ * @param {Object} queryParams - Request query object
  * @returns {string} Trimmed search string, or empty string
  */
 const getSearchTerm = function (queryParams) {
@@ -30,10 +52,10 @@ const getSearchTerm = function (queryParams) {
 };
 
 /**
- * Builds a safe MongoDB regex pattern from search term (escape + word match)
- * Search term is capped at MAX_SEARCH_TERM_LENGTH to avoid pathologically long patterns
+ * Builds a safe MongoDB regex pattern from search term.
+ * Capped at MAX_SEARCH_TERM_LENGTH to avoid long patterns.
  * @param {string} searchTerm - User search string
- * @returns {string|null} Pattern for $regex, or null if no search
+ * @returns {string|null} Pattern for $regex, or null
  */
 const buildSearchRegexPattern = function (searchTerm) {
   if (!searchTerm || !searchTerm.trim()) {
@@ -52,23 +74,77 @@ const buildSearchRegexPattern = function (searchTerm) {
 };
 
 /**
- * Builds MongoDB $or condition for case study search (single source of truth for searchable fields)
+ * Resolves relationship document IDs whose title or slug
+ * matches the search term. Returns a map of case-study
+ * ID-array field names to arrays of matching aposDocId values.
  * @param {string} searchTerm - User search string
- * @returns {Object|null} Condition to pass to query.and(), or null if no search
+ * @param {Object} apos - ApostropheCMS instance
+ * @param {Object} req - Request object
+ * @returns {Promise<Object>} Field-name-to-IDs map
  */
-const buildSearchCondition = function (searchTerm) {
+const resolveSearchRelationships = async function (searchTerm, apos, req) {
+  const regexPattern = buildSearchRegexPattern(searchTerm);
+  if (!regexPattern) {
+    return {};
+  }
+
+  const regexOpts = { $regex: regexPattern, $options: 'i' };
+  const result = {};
+
+  const lookups = RELATIONSHIP_CONFIGS.map(async (config) => {
+    const docs = await apos.modules[config.module]
+      .find(req, {})
+      .and({
+        $or: [{ title: regexOpts }, { slug: regexOpts }],
+      })
+      .toArray();
+
+    const ids = docs.map((doc) => doc.aposDocId);
+    if (ids.length > 0) {
+      config.caseStudyFields.forEach((field) => {
+        result[field] = ids;
+      });
+    }
+  });
+
+  await Promise.all(lookups);
+  return result;
+};
+
+/**
+ * Builds MongoDB $or condition for case study search across
+ * text fields and pre-resolved relationship ID fields.
+ * @param {string} searchTerm - User search string
+ * @param {Object} [resolvedRelationships] - Pre-resolved IDs
+ * @returns {Object|null} Condition for query.and(), or null
+ */
+const buildSearchCondition = function (searchTerm, resolvedRelationships) {
   const regexPattern = buildSearchRegexPattern(searchTerm);
   if (!regexPattern) {
     return null;
   }
+
   const regexOpts = { $regex: regexPattern, $options: 'i' };
-  return {
-    $or: [{ title: regexOpts }, { portfolioTitle: regexOpts }],
-  };
+  const orBranches = TEXT_FIELDS.map((field) => ({ [field]: regexOpts }));
+
+  const relationships = resolvedRelationships || {};
+  Object.keys(relationships).forEach((field) => {
+    const ids = relationships[field];
+    if (ids && ids.length > 0) {
+      orBranches.push({ [field]: { $in: ids } });
+    }
+  });
+
+  if (orBranches.length === 0) {
+    return null;
+  }
+
+  return { $or: orBranches };
 };
 
 module.exports = {
   buildSearchCondition,
   buildSearchRegexPattern,
   getSearchTerm,
+  resolveSearchRelationships,
 };
diff --git a/website/modules/case-studies-page/views/index.html b/website/modules/case-studies-page/views/index.html
index dcf98a91..78368f31 100644
--- a/website/modules/case-studies-page/views/index.html
+++ b/website/modules/case-studies-page/views/index.html
@@ -36,7 +36,7 @@
             placeholder="Search case studies"
             value="{{ data.query.search or '' }}"
             autocomplete="off"
-            aria-label="Search case studies by title"
+            aria-label="Search case studies"
           />
           <button
             type="button"
diff --git a/website/public/js/modules/case-studies-page/infinite-scroll.js b/website/public/js/modules/case-studies-page/infinite-scroll.js
index bd6a60d4..6786a475 100644
--- a/website/public/js/modules/case-studies-page/infinite-scroll.js
+++ b/website/public/js/modules/case-studies-page/infinite-scroll.js
@@ -6,14 +6,61 @@ document.addEventListener('DOMContentLoaded', function () {
   let isLoading = false;
   let errorCount = 0;
   const MAX_RETRIES = 3;
+  const existingCardUrls = new Set();
+
+  function trackExistingCards() {
+    const cards = grid.querySelectorAll('.cs_card');
+    cards.forEach((card) => {
+      if (card.href) {
+        existingCardUrls.add(card.href);
+      }
+    });
+  }
+
+  function hasActiveSidebarFilters(url) {
+    const filterParams = [
+      'industry[]',
+      'industry[0]',
+      'stack[]',
+      'stack[0]',
+      'caseStudyType[]',
+      'caseStudyType[0]',
+      'partner[]',
+      'partner[0]',
+    ];
+    return filterParams.some((param) => url.searchParams.has(param));
+  }
+
+  async function fetchWithFallback(url) {
+    let response = await fetch(url.toString());
+    if (
+      response.status === 404 &&
+      url.searchParams.has('search') &&
+      hasActiveSidebarFilters(url)
+    ) {
+      const fallbackUrl = new URL(url.toString());
+      fallbackUrl.searchParams.delete('search');
+      response = await fetch(fallbackUrl.toString());
+    }
+    return response;
+  }
+
+  function stopInfiniteScroll(observer, trigger) {
+    observer.unobserve(trigger);
+    isLoading = false;
+  }
 
   async function loadNextPage(observer, trigger) {
     const nextPage = currentPage + 1;
     const url = new URL(window.location.href);
     url.searchParams.set('page', nextPage);
     try {
-      const response = await fetch(url.toString());
+      const response = await fetchWithFallback(url);
       if (!response.ok) {
+        if (response.status === 404) {
+          stopInfiniteScroll(observer, trigger);
+          return;
+        }
         throw new Error('Network response was not ok');
       }
       const html = await response.text();
@@ -21,9 +68,14 @@ document.addEventListener('DOMContentLoaded', function () {
       const doc = parser.parseFromString(html, 'text/html');
       const newCards = doc.querySelectorAll('.cs_card');
       if (newCards.length === 0) {
-        throw new Error('No new case studies found');
+        stopInfiniteScroll(observer, trigger);
+        return;
       }
       newCards.forEach((card) => {
+        if (!card.href || existingCardUrls.has(card.href)) {
+          return;
+        }
+        existingCardUrls.add(card.href);
         grid.appendChild(card.cloneNode(true));
       });
       currentPage = nextPage;
@@ -55,18 +107,17 @@ document.addEventListener('DOMContentLoaded', function () {
   function handleLoadError(error, observer, trigger) {
     errorCount++;
     if (errorCount >= MAX_RETRIES) {
-      observer.unobserve(trigger);
+      stopInfiniteScroll(observer, trigger);
       displayErrorMessage(error);
-      isLoading = false;
       return;
     }
     setTimeout(() => {
       isLoading = false;
-      currentPage--;
     }, 1000);
   }
 
   if (trigger && grid) {
+    trackExistingCards();
     const observer = new IntersectionObserver(
       (entries) => {
         const entry = entries[0];
diff --git a/website/public/js/modules/case-studies-page/search-handler.js b/website/public/js/modules/case-studies-page/search-handler.js
index 6e87281a..9f8acaf6 100644
--- a/website/public/js/modules/case-studies-page/search-handler.js
+++ b/website/public/js/modules/case-studies-page/search-handler.js
@@ -78,7 +78,10 @@
   }
 
   function handleSearchFocus(event) {
-    event.target.setAttribute('placeholder', 'Try a title or description');
+    event.target.setAttribute(
+      'placeholder',
+      'Try a title, technology, or partner',
+    );
   }
 
   function handleSearchBlur(event) {

From de1c36c191d9b25b3c10f2f2e1cc6d510256674d Mon Sep 17 00:00:00 2001
From: Ihor Masechko <ihormasechko@Ihors-MacBook-Air.local>
Date: Wed, 25 Mar 2026 17:21:36 +0200
Subject: [PATCH 2/4] fix(case-studies): restore infinite scroll reliability
 and pagination

---
 website/modules/case-studies-page/index.js    |  9 ++++--
 .../case-studies-page/infinite-scroll.js      | 29 +++++++++++++++----
 .../case-studies-page/infinite-scroll.test.js |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/website/modules/case-studies-page/index.js b/website/modules/case-studies-page/index.js
index 748b3d1d..0582d115 100644
--- a/website/modules/case-studies-page/index.js
+++ b/website/modules/case-studies-page/index.js
@@ -53,6 +53,10 @@ const runApplyEnhancedSearchResults = async function (self, req) {
   if (!searchTerm) {
     return;
   }
+  let { perPage } = self;
+  if (!perPage) {
+    perPage = 6;
+  }
   const queryParams = { ...req.query };
   delete queryParams.search;
   const resolved = reqData.searchRelationships || {};
@@ -70,7 +74,8 @@ const runApplyEnhancedSearchResults = async function (self, req) {
 
   const piecesQuery = self.pieces
     .find(req, {})
-    .applyBuildersSafely(queryParams);
+    .applyBuildersSafely(queryParams)
+    .perPage(perPage);
   piecesQuery.and(searchCondition);
 
   const totalQuery = self.pieces.find(req, {}).applyBuildersSafely(queryParams);
@@ -80,7 +85,7 @@ const runApplyEnhancedSearchResults = async function (self, req) {
   const totalPieces = await totalQuery.toCount();
   reqData.pieces = pieces;
   reqData.totalPieces = totalPieces;
-  reqData.totalPages = 1;
+  reqData.totalPages = Math.max(1, Math.ceil(totalPieces / perPage));
 };
 
 const runSetupIndexData = async function (self, req) {
diff --git a/website/public/js/modules/case-studies-page/infinite-scroll.js b/website/public/js/modules/case-studies-page/infinite-scroll.js
index 6786a475..9081eb50 100644
--- a/website/public/js/modules/case-studies-page/infinite-scroll.js
+++ b/website/public/js/modules/case-studies-page/infinite-scroll.js
@@ -8,11 +8,25 @@ document.addEventListener('DOMContentLoaded', function () {
   const MAX_RETRIES = 3;
   const existingCardUrls = new Set();
 
+  function getCardUrl(card) {
+    if (!card) {
+      return null;
+    }
+    if (card.href) {
+      return card.href;
+    }
+    if (card.dataset && card.dataset.href) {
+      return card.dataset.href;
+    }
+    return null;
+  }
+
   function trackExistingCards() {
     const cards = grid.querySelectorAll('.cs_card');
     cards.forEach((card) => {
-      if (card.href) {
-        existingCardUrls.add(card.href);
+      const cardUrl = getCardUrl(card);
+      if (cardUrl) {
+        existingCardUrls.add(cardUrl);
       }
     });
   }
@@ -72,10 +86,13 @@ document.addEventListener('DOMContentLoaded', function () {
         return;
       }
       newCards.forEach((card) => {
-        if (!card.href || existingCardUrls.has(card.href)) {
+        const cardUrl = getCardUrl(card);
+        if (cardUrl && existingCardUrls.has(cardUrl)) {
           return;
         }
-        existingCardUrls.add(card.href);
+        if (cardUrl) {
+          existingCardUrls.add(cardUrl);
+        }
         grid.appendChild(card.cloneNode(true));
       });
       currentPage = nextPage;
@@ -119,13 +136,13 @@ document.addEventListener('DOMContentLoaded', function () {
   if (trigger && grid) {
     trackExistingCards();
     const observer = new IntersectionObserver(
-      (entries) => {
+      async (entries) => {
         const entry = entries[0];
         if (!entry.isIntersecting || isLoading || currentPage >= totalPages) {
           return;
         }
         isLoading = true;
-        loadNextPage(observer, trigger);
+        await loadNextPage(observer, trigger);
       },
       {
         rootMargin: '0px 0px 200px 0px',
diff --git a/website/public/js/modules/case-studies-page/infinite-scroll.test.js b/website/public/js/modules/case-studies-page/infinite-scroll.test.js
index e1927d51..2d99d237 100644
--- a/website/public/js/modules/case-studies-page/infinite-scroll.test.js
+++ b/website/public/js/modules/case-studies-page/infinite-scroll.test.js
@@ -93,7 +93,7 @@ describe('Infinite Scroll', () => {
 
     // Simulate intersection twice
     const observer = mockIntersectionObserver.mock.results[0].value;
-    await observer.callback([{ isIntersecting: true }]);
+    observer.callback([{ isIntersecting: true }]);
     await observer.callback([{ isIntersecting: true }]);
 
     expect(global.fetch).toHaveBeenCalledTimes(1);

From 27aa51af2087a7a0501ed8fe7f89572efb60399a Mon Sep 17 00:00:00 2001
From: Ihor Masechko <ihormasechko@Ihors-MacBook-Air.local>
Date: Thu, 26 Mar 2026 11:31:12 +0200
Subject: [PATCH 3/4] fix case studies relationship search and add centered
 empty state

---
 website/modules/asset/ui/src/scss/_cases.scss | 53 +++++++++++++++++
 website/modules/case-studies-page/index.js    | 57 +++++++++++++++----
 .../case-studies-page/views/index.html        | 11 +++-
 3 files changed, 109 insertions(+), 12 deletions(-)

diff --git a/website/modules/asset/ui/src/scss/_cases.scss b/website/modules/asset/ui/src/scss/_cases.scss
index 3f593f3d..8f387322 100644
--- a/website/modules/asset/ui/src/scss/_cases.scss
+++ b/website/modules/asset/ui/src/scss/_cases.scss
@@ -756,6 +756,59 @@
   }
 }
 
+.cs_empty-state {
+  width: 100%;
+  min-height: 220px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  gap: 8px;
+  padding: 24px 16px;
+  text-align: center;
+  background-color: $white;
+
+  @include breakpoint-medium {
+    min-height: 280px;
+    padding: 40px 24px;
+  }
+}
+
+.cs_list--empty {
+  justify-content: center;
+  align-items: center;
+  min-height: calc(100vh - 240px);
+
+  @include breakpoint-medium {
+    min-height: calc(100vh - 290px);
+  }
+
+  .tags-filter {
+    display: none;
+  }
+}
+
+.cs_empty-state--standalone {
+  width: min(960px, 100%);
+  margin: 0 auto;
+}
+
+.cs_empty-state-title {
+  margin: 0;
+  color: $gray-500;
+  @include responsive-font(20px, 28px);
+  @include responsive-line-height(120%, 120%);
+  font-weight: $font-weight-extra-bold;
+}
+
+.cs_empty-state-text {
+  margin: 0;
+  max-width: 520px;
+  color: $gray-300;
+  @include responsive-font(12px, 14px);
+  @include responsive-line-height(150%, 150%);
+}
+
 .cs_card {
   background-color: $white;
   border: 1px solid $whisper;
diff --git a/website/modules/case-studies-page/index.js b/website/modules/case-studies-page/index.js
index 0582d115..e6375ed0 100644
--- a/website/modules/case-studies-page/index.js
+++ b/website/modules/case-studies-page/index.js
@@ -4,6 +4,47 @@ const SearchService = require('./services/SearchService');
 const TagCountService = require('./services/TagCountService');
 const UrlService = require('./services/UrlService');
 
+const createDocMapById = function (docs) {
+  const map = {};
+  docs.forEach((doc) => {
+    map[doc.aposDocId] = {
+      label: doc.title,
+      value: doc.slug,
+    };
+  });
+  return map;
+};
+
+const collectFilterOptions = function (pieces, fieldName, docMap) {
+  const values = {};
+  pieces.forEach((piece) => {
+    const ids = piece[fieldName] || [];
+    ids.forEach((id) => {
+      if (docMap[id]) {
+        values[id] = docMap[id];
+      }
+    });
+  });
+  const options = Object.values(values);
+  options.sort((first, second) => first.label.localeCompare(second.label));
+  return options;
+};
+
+const buildPiecesFiltersFromResults = async function (self, req, pieces) {
+  const [tags, partners] = await Promise.all([
+    self.apos.modules['cases-tags'].find(req).toArray(),
+    self.apos.modules['business-partner'].find(req).toArray(),
+  ]);
+  const tagMap = createDocMapById(tags);
+  const partnerMap = createDocMapById(partners);
+  return {
+    industry: collectFilterOptions(pieces, 'industryIds', tagMap),
+    stack: collectFilterOptions(pieces, 'stackIds', tagMap),
+    caseStudyType: collectFilterOptions(pieces, 'caseStudyTypeIds', tagMap),
+    partner: collectFilterOptions(pieces, 'partnerIds', partnerMap),
+  };
+};
+
 const buildIndexQuery = function (self, req) {
   const queryParams = { ...req.query };
   const searchTerm = SearchService.getSearchTerm(queryParams);
@@ -53,10 +94,6 @@ const runApplyEnhancedSearchResults = async function (self, req) {
   if (!searchTerm) {
     return;
   }
-  let { perPage } = self;
-  if (!perPage) {
-    perPage = 6;
-  }
   const queryParams = { ...req.query };
   delete queryParams.search;
   const resolved = reqData.searchRelationships || {};
@@ -74,18 +111,16 @@ const runApplyEnhancedSearchResults = async function (self, req) {
 
   const piecesQuery = self.pieces
     .find(req, {})
-    .applyBuildersSafely(queryParams)
-    .perPage(perPage);
+    .applyBuildersSafely(queryParams);
   piecesQuery.and(searchCondition);
 
-  const totalQuery = self.pieces.find(req, {}).applyBuildersSafely(queryParams);
-  totalQuery.and(searchCondition);
-
   const pieces = await piecesQuery.toArray();
-  const totalPieces = await totalQuery.toCount();
+  const totalPieces = pieces.length;
+  const piecesFilters = await buildPiecesFiltersFromResults(self, req, pieces);
   reqData.pieces = pieces;
   reqData.totalPieces = totalPieces;
-  reqData.totalPages = Math.max(1, Math.ceil(totalPieces / perPage));
+  reqData.totalPages = 1;
+  reqData.piecesFilters = piecesFilters;
 };
 
 const runSetupIndexData = async function (self, req) {
diff --git a/website/modules/case-studies-page/views/index.html b/website/modules/case-studies-page/views/index.html
index 78368f31..9680b986 100644
--- a/website/modules/case-studies-page/views/index.html
+++ b/website/modules/case-studies-page/views/index.html
@@ -150,7 +150,7 @@
       {% endif %}
     </div>
 
-    <div class="cs_list">
+    <div class="cs_list{% if not data.pieces or not data.pieces.length %} cs_list--empty{% endif %}">
       <div class="tags-filter">
         {# Display all filter types #} {% for filterType, filterLabel in [
         ['industry', 'Industry'], ['caseStudyType', 'Case Type'], ['stack',
@@ -307,6 +307,7 @@
         {% endif %} {% endfor %}
       </div>
 
+      {% if data.pieces and data.pieces.length %}
       <div class="cs_grid" id="case-studies-grid">
         {% for article in data.pieces %} {# CARD START: {{ article.title }} #}
         <a href="{{ data.buildCaseStudyUrl(article._url) }}" class="cs_card">
@@ -358,6 +359,14 @@ <h4 class="portfolio-title">{{ article.portfolioTitle }}</h4>
         </a>
         {# CARD END: {{ article.title }} #} {% endfor %}
       </div>
+      {% else %}
+      <div class="cs_empty-state cs_empty-state--standalone" role="status" aria-live="polite">
+        <h3 class="cs_empty-state-title">No Results Found</h3>
+        <p class="cs_empty-state-text">
+          Try a different keyword or clear filters to see more case studies.
+        </p>
+      </div>
+      {% endif %}
     </div>
 
     <div id="filter-modal" class="filter-modal">

From a5d7afda8b76d9f646b95bbafccad89e92e9092d Mon Sep 17 00:00:00 2001
From: Ihor Masechko <ihormasechko@Ihors-MacBook-Air.local>
Date: Thu, 26 Mar 2026 11:42:02 +0200
Subject: [PATCH 4/4] stabilize case studies search logic and empty-state
 presentation

---
 website/modules/asset/ui/src/scss/_cases.scss |  1 +
 website/modules/case-studies-page/index.js    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/website/modules/asset/ui/src/scss/_cases.scss b/website/modules/asset/ui/src/scss/_cases.scss
index 8f387322..d0216600 100644
--- a/website/modules/asset/ui/src/scss/_cases.scss
+++ b/website/modules/asset/ui/src/scss/_cases.scss
@@ -798,6 +798,7 @@
   color: $gray-500;
   @include responsive-font(20px, 28px);
   @include responsive-line-height(120%, 120%);
+
   font-weight: $font-weight-extra-bold;
 }
 
diff --git a/website/modules/case-studies-page/index.js b/website/modules/case-studies-page/index.js
index e6375ed0..420b2781 100644
--- a/website/modules/case-studies-page/index.js
+++ b/website/modules/case-studies-page/index.js
@@ -212,17 +212,17 @@ module.exports = {
       indexQuery(req) {
         return buildIndexQuery(self, req);
       },
-      async resolveSearchRelationships(req) {
-        return await runResolveSearchRelationships(self, req);
+      resolveSearchRelationships(req) {
+        return runResolveSearchRelationships(self, req);
       },
-      async applyEnhancedSearchResults(req) {
-        return await runApplyEnhancedSearchResults(self, req);
+      applyEnhancedSearchResults(req) {
+        return runApplyEnhancedSearchResults(self, req);
       },
-      async setupIndexData(req) {
-        return await runSetupIndexData(self, req);
+      setupIndexData(req) {
+        return runSetupIndexData(self, req);
       },
-      async setupShowData(req) {
-        return await runSetupShowData(self, req);
+      setupShowData(req) {
+        return runSetupShowData(self, req);
       },
     };
   },