diff --git a/frontend/src/app/board/[year]/candidates/page.tsx b/frontend/src/app/board/[year]/candidates/page.tsx
index cbb8c346ac..56ac410a29 100644
--- a/frontend/src/app/board/[year]/candidates/page.tsx
+++ b/frontend/src/app/board/[year]/candidates/page.tsx
@@ -477,13 +477,13 @@ const BoardCandidatesPage = () => {
                     (
                     {ledChapters.length > 0 && (
                       <>
-                        {ledChapters.length} chapter{ledChapters.length !== 1 ? 's' : ''}
+                        {ledChapters.length} chapter{ledChapters.length === 1 ? '' : 's'}
                       </>
                     )}
                     {ledChapters.length > 0 && ledProjects.length > 0 && ', '}
                     {ledProjects.length > 0 && (
                       <>
-                        {ledProjects.length} project{ledProjects.length !== 1 ? 's' : ''}
+                        {ledProjects.length} project{ledProjects.length === 1 ? '' : 's'}
                       </>
                     )}
                     )
diff --git a/frontend/src/components/CardDetailsPage.tsx b/frontend/src/components/CardDetailsPage.tsx
index 914197db87..279fabd632 100644
--- a/frontend/src/components/CardDetailsPage.tsx
+++ b/frontend/src/components/CardDetailsPage.tsx
@@ -159,7 +159,7 @@ const DetailsCard = ({
               detail?.label === 'Leaders' ? (
                 <div key={detail.label} className="flex flex-row gap-1 pb-1">
                   <strong>{detail.label}:</strong>{' '}
-                  <LeadersList leaders={detail?.value != null ? String(detail.value) : 'Unknown'} />
+                  <LeadersList leaders={detail?.value == null ? 'Unknown' : String(detail.value)} />
                 </div>
               ) : (
                 <div key={detail.label} className="pb-1">
diff --git a/frontend/src/components/ModuleCard.tsx b/frontend/src/components/ModuleCard.tsx
index 87de94edf9..5c2b9faab1 100644
--- a/frontend/src/components/ModuleCard.tsx
+++ b/frontend/src/components/ModuleCard.tsx
@@ -105,7 +105,7 @@ export const getSimpleDuration = (start: string | number, end: string | number):
 
   const ms = endDate.getTime() - startDate.getTime()
   const days = Math.floor(ms / (1000 * 60 * 60 * 24))
-
   const weeks = Math.ceil(days / 7)
-  return `${weeks} week${weeks !== 1 ? 's' : ''}`
+
+  return `${weeks} week${weeks === 1 ? '' : 's'}`
 }
diff --git a/frontend/src/components/SearchPageLayout.tsx b/frontend/src/components/SearchPageLayout.tsx
index 699cdbb21a..a6da7fe3b2 100644
--- a/frontend/src/components/SearchPageLayout.tsx
+++ b/frontend/src/components/SearchPageLayout.tsx
@@ -49,9 +49,7 @@ const SearchPageLayout = ({
           initialValue={searchQuery}
         />
       </div>
-      {!isLoaded ? (
-        <SkeletonBase indexName={indexName} loadingImageUrl={loadingImageUrl} />
-      ) : (
+      {isLoaded ? (
         <>
           <div>
             {totalPages !== 0 && <div className="flex justify-end">{sortChildren}</div>}
@@ -67,6 +65,8 @@ const SearchPageLayout = ({
             />
           )}
         </>
+      ) : (
+        <SkeletonBase indexName={indexName} loadingImageUrl={loadingImageUrl} />
       )}
     </div>
   )