diff --git a/frontend/components/icons/FilterFunnel.tsx b/frontend/components/icons/FilterFunnel.tsx
index f24d06c8c3..a1a273ea0c 100644
--- a/frontend/components/icons/FilterFunnel.tsx
+++ b/frontend/components/icons/FilterFunnel.tsx
@@ -11,7 +11,6 @@ const FilterFunnel = ({
   size = "medium",
   color = "ui-fleet-black-33",
 }: IFilterFunnelProps) => {
-  console.log("color", color);
   return (
     <svg
       width={ICON_SIZES[size]}
diff --git a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
index 6eb3a7c1b7..3f6c875c1e 100644
--- a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
@@ -582,9 +582,15 @@ const ManagePolicyPage = ({
   const availablePoliciesForAutomation =
     (isAnyTeamSelected ? teamPolicies : globalPolicies) || [];
 
+  const policiesErrors = isAnyTeamSelected
+    ? teamPoliciesError
+    : globalPoliciesError;
+
+  const policyResults = isAnyTeamSelected ? !!teamPolicies : !!globalPolicies;
+
+  // Show CTA buttons if there is no errors AND there are policy results or a search filter
   const showCtaButtons =
-    (isAnyTeamSelected && teamPolicies) ||
-    (!isAnyTeamSelected && globalPolicies);
+    !policiesErrors && (policyResults || searchQuery !== "");
 
   const automationsConfig = isAnyTeamSelected ? teamConfig : config;
 
@@ -610,18 +616,77 @@ const ManagePolicyPage = ({
   }
 
   const renderPoliciesCount = (count?: number) => {
+    // Show count if there is no errors AND there are policy results or a search filter
+    const showCount =
+      count !== undefined &&
+      !policiesErrors &&
+      (policyResults || searchQuery !== "");
+
     return (
       <div className={`${baseClass}__count`}>
-        {count !== undefined && (
+        {showCount && (
           <span>{`${count} polic${count === 1 ? "y" : "ies"}`}</span>
         )}
       </div>
     );
   };
 
-  return !isRouteOk || (isPremiumTier && !userTeams) ? (
-    <Spinner />
-  ) : (
+  const renderMainTable = () => {
+    return !isRouteOk || (isPremiumTier && !userTeams) ? (
+      <Spinner />
+    ) : (
+      <div>
+        {isAnyTeamSelected && teamPoliciesError && <TableDataError />}
+        {isAnyTeamSelected && !teamPoliciesError && (
+          <PoliciesTable
+            policiesList={teamPolicies || []}
+            isLoading={
+              isFetchingTeamPolicies || isFetchingTeamConfig || isFetchingConfig
+            }
+            onAddPolicyClick={onAddPolicyClick}
+            onDeletePolicyClick={onDeletePolicyClick}
+            canAddOrDeletePolicy={canAddOrDeletePolicy}
+            currentTeam={currentTeamSummary}
+            currentAutomatedPolicies={currentAutomatedPolicies}
+            renderPoliciesCount={() =>
+              !isFetchingTeamCount && renderPoliciesCount(teamPoliciesCount)
+            }
+            isPremiumTier={isPremiumTier}
+            isSandboxMode={isSandboxMode}
+            searchQuery={searchQuery}
+            sortHeader={sortHeader}
+            sortDirection={sortDirection}
+            page={page}
+            onQueryChange={onQueryChange}
+          />
+        )}
+        {!isAnyTeamSelected && globalPoliciesError && <TableDataError />}
+        {!isAnyTeamSelected && !globalPoliciesError && (
+          <PoliciesTable
+            policiesList={globalPolicies || []}
+            isLoading={isFetchingGlobalPolicies || isFetchingConfig}
+            onAddPolicyClick={onAddPolicyClick}
+            onDeletePolicyClick={onDeletePolicyClick}
+            canAddOrDeletePolicy={canAddOrDeletePolicy}
+            currentTeam={currentTeamSummary}
+            currentAutomatedPolicies={currentAutomatedPolicies}
+            isPremiumTier={isPremiumTier}
+            isSandboxMode={isSandboxMode}
+            renderPoliciesCount={() =>
+              !isFetchingGlobalCount && renderPoliciesCount(globalPoliciesCount)
+            }
+            searchQuery={searchQuery}
+            sortHeader={sortHeader}
+            sortDirection={sortDirection}
+            page={page}
+            onQueryChange={onQueryChange}
+          />
+        )}
+      </div>
+    );
+  };
+
+  return (
     <MainContent className={baseClass}>
       <div className={`${baseClass}__wrapper`}>
         <div className={`${baseClass}__header-wrap`}>
@@ -647,30 +712,31 @@ const ManagePolicyPage = ({
           </div>
           {showCtaButtons && (
             <div className={`${baseClass} button-wrap`}>
-              {canManageAutomations &&
-                automationsConfig &&
-                !isFetchingGlobalPolicies && (
+              {canManageAutomations && automationsConfig && (
+                <Button
+                  onClick={toggleManageAutomationsModal}
+                  className={`${baseClass}__manage-automations button`}
+                  variant="inverse"
+                  disabled={
+                    isAnyTeamSelected
+                      ? isFetchingTeamPolicies
+                      : isFetchingGlobalPolicies
+                  }
+                >
+                  <span>Manage automations</span>
+                </Button>
+              )}
+              {canAddOrDeletePolicy && (
+                <div className={`${baseClass}__action-button-container`}>
                   <Button
-                    onClick={toggleManageAutomationsModal}
-                    className={`${baseClass}__manage-automations button`}
-                    variant="inverse"
+                    variant="brand"
+                    className={`${baseClass}__select-policy-button`}
+                    onClick={onAddPolicyClick}
                   >
-                    <span>Manage automations</span>
+                    Add a policy
                   </Button>
-                )}
-              {canAddOrDeletePolicy &&
-                ((isAnyTeamSelected && !isFetchingTeamPolicies) ||
-                  !isFetchingGlobalPolicies) && (
-                  <div className={`${baseClass}__action-button-container`}>
-                    <Button
-                      variant="brand"
-                      className={`${baseClass}__select-policy-button`}
-                      onClick={onAddPolicyClick}
-                    >
-                      Add a policy
-                    </Button>
-                  </div>
-                )}
+                </div>
+              )}
             </div>
           )}
         </div>
@@ -687,65 +753,7 @@ const ManagePolicyPage = ({
             </p>
           )}
         </div>
-        <div>
-          {isAnyTeamSelected && teamPoliciesError && <TableDataError />}
-          {isAnyTeamSelected &&
-            !teamPoliciesError &&
-            (isFetchingTeamPolicies ? (
-              <Spinner />
-            ) : (
-              <PoliciesTable
-                policiesList={teamPolicies || []}
-                isLoading={
-                  isFetchingTeamPolicies ||
-                  isFetchingTeamConfig ||
-                  isFetchingConfig
-                }
-                onAddPolicyClick={onAddPolicyClick}
-                onDeletePolicyClick={onDeletePolicyClick}
-                canAddOrDeletePolicy={canAddOrDeletePolicy}
-                currentTeam={currentTeamSummary}
-                currentAutomatedPolicies={currentAutomatedPolicies}
-                renderPoliciesCount={() =>
-                  !isFetchingTeamCount && renderPoliciesCount(teamPoliciesCount)
-                }
-                isPremiumTier={isPremiumTier}
-                isSandboxMode={isSandboxMode}
-                searchQuery={searchQuery}
-                sortHeader={sortHeader}
-                sortDirection={sortDirection}
-                page={page}
-                onQueryChange={onQueryChange}
-              />
-            ))}
-          {!isAnyTeamSelected && globalPoliciesError && <TableDataError />}
-          {!isAnyTeamSelected &&
-            !globalPoliciesError &&
-            (isFetchingGlobalPolicies ? (
-              <Spinner />
-            ) : (
-              <PoliciesTable
-                policiesList={globalPolicies || []}
-                isLoading={isFetchingGlobalPolicies || isFetchingConfig}
-                onAddPolicyClick={onAddPolicyClick}
-                onDeletePolicyClick={onDeletePolicyClick}
-                canAddOrDeletePolicy={canAddOrDeletePolicy}
-                currentTeam={currentTeamSummary}
-                currentAutomatedPolicies={currentAutomatedPolicies}
-                isPremiumTier={isPremiumTier}
-                isSandboxMode={isSandboxMode}
-                renderPoliciesCount={() =>
-                  !isFetchingGlobalCount &&
-                  renderPoliciesCount(globalPoliciesCount)
-                }
-                searchQuery={searchQuery}
-                sortHeader={sortHeader}
-                sortDirection={sortDirection}
-                page={page}
-                onQueryChange={onQueryChange}
-              />
-            ))}
-        </div>
+        {renderMainTable()}
         {showInheritedPoliciesButton && globalPoliciesCount && (
           <RevealButton
             isShowing={showInheritedTable}
@@ -768,27 +776,24 @@ const ManagePolicyPage = ({
         {showInheritedPoliciesButton && showInheritedTable && (
           <div className={`${baseClass}__inherited-policies-table`}>
             {globalPoliciesError && <TableDataError />}
-            {!globalPoliciesError &&
-              (isFetchingGlobalPolicies ? (
-                <Spinner />
-              ) : (
-                <PoliciesTable
-                  isLoading={isFetchingTeamPolicies}
-                  policiesList={inheritedPolicies || []}
-                  onDeletePolicyClick={noop}
-                  canAddOrDeletePolicy={canAddOrDeletePolicy}
-                  tableType="inheritedPolicies"
-                  currentTeam={currentTeamSummary}
-                  searchQuery=""
-                  renderPoliciesCount={() =>
-                    renderPoliciesCount(teamPoliciesCount)
-                  }
-                  sortHeader={inheritedSortHeader}
-                  sortDirection={inheritedSortDirection}
-                  page={inheritedPage}
-                  onQueryChange={onQueryChange}
-                />
-              ))}
+            {!globalPoliciesError && (
+              <PoliciesTable
+                isLoading={isFetchingTeamPolicies}
+                policiesList={inheritedPolicies || []}
+                onDeletePolicyClick={noop}
+                canAddOrDeletePolicy={canAddOrDeletePolicy}
+                tableType="inheritedPolicies"
+                currentTeam={currentTeamSummary}
+                searchQuery=""
+                renderPoliciesCount={() =>
+                  renderPoliciesCount(teamPoliciesCount)
+                }
+                sortHeader={inheritedSortHeader}
+                sortDirection={inheritedSortDirection}
+                page={inheritedPage}
+                onQueryChange={onQueryChange}
+              />
+            )}
           </div>
         )}
         {config && automationsConfig && showManageAutomationsModal && (
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTable.tsx b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTable.tsx
index f6e850a577..83d1f30fda 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTable.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTable.tsx
@@ -137,60 +137,51 @@ const PoliciesTable = ({
         canAddOrDeletePolicy ? "" : "hide-selection-column"
       }`}
     >
-      {isLoading ? (
-        <Spinner />
-      ) : (
-        <TableContainer
-          resultsTitle="policies"
-          columns={generateTableHeaders(
-            {
-              selectedTeamId: currentTeam?.id,
-              canAddOrDeletePolicy,
-              tableType,
-            },
-            isPremiumTier,
-            isSandboxMode
-          )}
-          data={generateDataSet(
-            policiesList,
-            currentAutomatedPolicies,
-            config?.update_interval.osquery_policy
-          )}
-          // filters={{ global: searchQuery }}
-          isLoading={isLoading}
-          defaultSortHeader={sortHeader || DEFAULT_SORT_HEADER}
-          defaultSortDirection={sortDirection || DEFAULT_SORT_DIRECTION}
-          defaultSearchQuery={searchQuery}
-          defaultPageIndex={page}
-          showMarkAllPages={false}
-          isAllPagesSelected={false}
-          primarySelectAction={{
-            name: "delete policy",
-            buttonText: "Delete",
-            iconSvg: "trash",
-            variant: "text-icon",
-            onActionButtonClick: onDeletePolicyClick,
-          }}
-          emptyComponent={() =>
-            EmptyTable({
-              iconName: emptyState().iconName,
-              header: emptyState().header,
-              info: emptyState().info,
-              additionalInfo: emptyState().additionalInfo,
-              primaryButton: emptyState().primaryButton,
-            })
-          }
-          disableCount={tableType === "inheritedPolicies"}
-          renderCount={renderPoliciesCount}
-          // isClientSidePagination
-          // onClientSidePaginationChange={onClientSidePaginationChange}
-          // isClientSideFilter
-          // searchQueryColumn="name"
-          onQueryChange={onTableQueryChange}
-          inputPlaceHolder="Search by name"
-          searchable={searchable}
-        />
-      )}
+      <TableContainer
+        resultsTitle="policies"
+        columns={generateTableHeaders(
+          {
+            selectedTeamId: currentTeam?.id,
+            canAddOrDeletePolicy,
+            tableType,
+          },
+          isPremiumTier,
+          isSandboxMode
+        )}
+        data={generateDataSet(
+          policiesList,
+          currentAutomatedPolicies,
+          config?.update_interval.osquery_policy
+        )}
+        isLoading={isLoading}
+        defaultSortHeader={sortHeader || DEFAULT_SORT_HEADER}
+        defaultSortDirection={sortDirection || DEFAULT_SORT_DIRECTION}
+        defaultSearchQuery={searchQuery}
+        defaultPageIndex={page}
+        showMarkAllPages={false}
+        isAllPagesSelected={false}
+        primarySelectAction={{
+          name: "delete policy",
+          buttonText: "Delete",
+          iconSvg: "trash",
+          variant: "text-icon",
+          onActionButtonClick: onDeletePolicyClick,
+        }}
+        emptyComponent={() =>
+          EmptyTable({
+            iconName: emptyState().iconName,
+            header: emptyState().header,
+            info: emptyState().info,
+            additionalInfo: emptyState().additionalInfo,
+            primaryButton: emptyState().primaryButton,
+          })
+        }
+        disableCount={tableType === "inheritedPolicies"}
+        renderCount={renderPoliciesCount}
+        onQueryChange={onTableQueryChange}
+        inputPlaceHolder="Search by name"
+        searchable={searchable}
+      />
     </div>
   );
 };
diff --git a/frontend/pages/software/ManageSoftwarePage/ManageSoftwarePage.tsx b/frontend/pages/software/ManageSoftwarePage/ManageSoftwarePage.tsx
index 9cbe20a177..ee01fbf49f 100644
--- a/frontend/pages/software/ManageSoftwarePage/ManageSoftwarePage.tsx
+++ b/frontend/pages/software/ManageSoftwarePage/ManageSoftwarePage.tsx
@@ -615,14 +615,6 @@ const ManageSoftwarePage = ({
       queryParams.vulnerable === "true");
 
   const renderSoftwareTable = () => {
-    if (
-      isFetchingCount ||
-      isFetchingSoftware ||
-      !globalConfig ||
-      (!softwareConfig && !softwareConfigError)
-    ) {
-      return <Spinner />;
-    }
     if (
       (softwareError && !isFetchingSoftware) ||
       (softwareConfigError && !isFetchingSoftwareConfig)
@@ -633,7 +625,12 @@ const ManageSoftwarePage = ({
       <TableContainer
         columns={softwareTableHeaders}
         data={(isSoftwareEnabled && software?.software) || []}
-        isLoading={false}
+        isLoading={
+          isFetchingCount ||
+          isFetchingSoftware ||
+          !globalConfig ||
+          (!softwareConfig && !softwareConfigError)
+        }
         resultsTitle={"software items"}
         emptyComponent={() => (
           <EmptySoftwareTable
diff --git a/frontend/pages/software/ManageSoftwarePage/_styles.scss b/frontend/pages/software/ManageSoftwarePage/_styles.scss
index daf3b78ce2..ad2d32f106 100644
--- a/frontend/pages/software/ManageSoftwarePage/_styles.scss
+++ b/frontend/pages/software/ManageSoftwarePage/_styles.scss
@@ -16,6 +16,11 @@
     padding: $pad-small $pad-medium;
   }
 
+  &__count {
+    display: flex;
+    gap: 12px;
+  }
+
   &__header {
     display: flex;
     align-items: center;