diff --git a/pages/tools/components/Sidebar.tsx b/pages/tools/components/Sidebar.tsx
index e6673b813..020760476 100644
--- a/pages/tools/components/Sidebar.tsx
+++ b/pages/tools/components/Sidebar.tsx
@@ -43,8 +43,9 @@ export default function Sidebar({
   setIsSidebarOpen,
 }: SidebarProps) {
   const filterFormRef = useRef<HTMLFormElement>(null);
-  const [pendingSelections, setPendingSelections] =
-    useState<Transform>(transform);
+  const [pendingSelections, setPendingSelections] = useState<Transform>(
+    () => transform,
+  );
 
   // Sync pendingSelections with transform when transform changes
   useEffect(() => {
@@ -155,7 +156,7 @@ export default function Sidebar({
           label='Show obsolete'
           value='showObsolete'
           name='showObsolete'
-          checked={pendingSelections['showObsolete'] === 'true'}
+          checked={pendingSelections.showObsolete === 'true'}
           onChange={(checked) =>
             setPendingSelections((prev) => ({
               ...prev,
@@ -163,11 +164,12 @@ export default function Sidebar({
             }))
           }
         />
+
         <Checkbox
           label='Support Bowtie'
           value='supportsBowtie'
           name='supportsBowtie'
-          checked={pendingSelections['supportsBowtie'] === 'true'}
+          checked={pendingSelections.supportsBowtie === 'true'}
           onChange={(checked) =>
             setPendingSelections((prev) => ({
               ...prev,
@@ -175,6 +177,7 @@ export default function Sidebar({
             }))
           }
         />
+
         <div className='w-full flex items-center justify-between mt-4 gap-2'>
           <Button
             type='submit'
diff --git a/pages/tools/components/ToolingTable.tsx b/pages/tools/components/ToolingTable.tsx
index 95bdc6ec7..2732f9b08 100644
--- a/pages/tools/components/ToolingTable.tsx
+++ b/pages/tools/components/ToolingTable.tsx
@@ -26,13 +26,14 @@ interface ToolingTableProps {
   transform: Transform;
   setTransform: Dispatch<SetStateAction<Transform>>;
   numberOfTools: number;
+  onVisibleToolCountChange?: (count: number) => void;
 }
 
 const ToolingTable = ({
   toolsByGroup,
   transform,
   setTransform,
-  numberOfTools,
+  onVisibleToolCountChange,
 }: ToolingTableProps) => {
   const [selectedTool, setSelectedTool] = useState<JSONSchemaTool | null>(null);
   const [bowtieReport, setBowtieReport] = useState<BowtieReport | null>(null);
@@ -65,8 +66,8 @@ const ToolingTable = ({
     }
 
     const rootUrlRegex = /^(https?:\/\/[^/]+\/[^/]+\/[^/]+)/;
-
     const match = cleanedSource.match(rootUrlRegex);
+
     if (match) {
       const rootUri = match[1];
       const rootMatch = bowtieReport[rootUri];
@@ -74,11 +75,23 @@ const ToolingTable = ({
         return rootMatch;
       }
     }
-
     return null;
   };
 
-  const groups = Object.keys(toolsByGroup);
+  const filteredToolsByGroup = Object.fromEntries(
+    Object.entries(toolsByGroup).map(([group, tools]) => [
+      group,
+      transform.supportsBowtie === 'true'
+        ? tools.filter((tool) => Boolean(getBowtieData(tool)))
+        : tools,
+    ]),
+  );
+
+  const groupWithTools = Object.entries(filteredToolsByGroup)
+    .filter(([, tools]) => tools.length > 0)
+    .map(([group]) => group);
+
+  const groups = groupWithTools;
 
   const openModal = (tool: JSONSchemaTool) => {
     setSelectedTool(tool);
@@ -99,7 +112,15 @@ const ToolingTable = ({
     setSelectedTool(null);
   };
 
-  if (numberOfTools === 0) {
+  const visibleToolCount = Object.values(filteredToolsByGroup).reduce(
+    (sum, tools) => sum + tools.length,
+    0,
+  );
+  useEffect(() => {
+    onVisibleToolCountChange?.(visibleToolCount);
+  }, [visibleToolCount, onVisibleToolCountChange]);
+
+  if (visibleToolCount === 0) {
     return (
       <div className='text-center py-12 text-gray-500 dark:text-gray-400 border'>
         <p className='text-lg'>No Tools Found :(</p>
@@ -178,156 +199,158 @@ const ToolingTable = ({
                 </tr>
               </thead>
               <tbody>
-                {toolsByGroup[group].map((tool: JSONSchemaTool, index) => {
-                  const bowtieData = getBowtieData(tool);
-                  if (bowtieData) {
-                    tool.bowtie = bowtieData;
-                  }
-                  return (
-                    <tr
-                      key={index}
-                      className='flex w-full hover:bg-gray-100 dark:hover:bg-slate-700 cursor-pointer'
-                      onClick={() => openModal(tool)}
-                    >
-                      <TableCell
-                        attributes={{
-                          className: `${tool.name.split(' ').some((segment) => segment.length > 25) ? 'break-all' : ''} gap-x-2 gap-y-1`,
-                          style: {
-                            flexBasis: '240px',
-                            flexShrink: 1,
-                            flexGrow: 0,
-                          },
-                          title: 'See details',
-                        }}
+                {(filteredToolsByGroup[group] ?? []).map(
+                  (tool: JSONSchemaTool, index) => {
+                    const bowtieData = getBowtieData(tool);
+                    return (
+                      <tr
+                        key={index}
+                        className='flex w-full hover:bg-gray-100 dark:hover:bg-slate-700 cursor-pointer'
+                        onClick={() => openModal(tool)}
                       >
-                        {tool.name}
-                        {tool.status === 'obsolete' && (
-                          <Tag intent='error'>{tool.status}</Tag>
+                        <TableCell
+                          attributes={{
+                            className: `${tool.name.split(' ').some((segment) => segment.length > 25) ? 'break-all' : ''} gap-x-2 gap-y-1`,
+                            style: {
+                              flexBasis: '240px',
+                              flexShrink: 1,
+                              flexGrow: 0,
+                            },
+                            title: 'See details',
+                          }}
+                        >
+                          {tool.name}
+                          {tool.status === 'obsolete' && (
+                            <Tag intent='error'>{tool.status}</Tag>
+                          )}
+                        </TableCell>
+                        {transform.groupBy !== 'toolingTypes' && (
+                          <TableCell
+                            attributes={{
+                              style: { flexBasis: '15%' },
+                            }}
+                          >
+                            {tool.toolingTypes
+                              ?.map((type) => toTitleCase(type, '-'))
+                              .join(', ')}
+                          </TableCell>
+                        )}
+                        {transform.groupBy !== 'languages' && (
+                          <TableCell
+                            attributes={{
+                              style: { flexBasis: '15%' },
+                            }}
+                          >
+                            {tool.languages?.join(', ')}
+                          </TableCell>
                         )}
-                      </TableCell>
-                      {transform.groupBy !== 'toolingTypes' && (
                         <TableCell
                           attributes={{
-                            style: { flexBasis: '15%' },
+                            className: '!block !px-0',
+                            style: { flexBasis: '20%', flexGrow: 1 },
                           }}
                         >
-                          {tool.toolingTypes
-                            ?.map((type) => toTitleCase(type, '-'))
-                            .join(', ')}
+                          {tool.supportedDialects?.draft?.map((draft) => {
+                            return <Badge key={draft}>{draft}</Badge>;
+                          })}
+                        </TableCell>
+                        <TableCell attributes={{ style: { flexBasis: '15%' } }}>
+                          {tool.license}
                         </TableCell>
-                      )}
-                      {transform.groupBy !== 'languages' && (
                         <TableCell
                           attributes={{
-                            style: { flexBasis: '15%' },
+                            className: 'text-center !px-0',
+                            style: {
+                              flexBasis: '70px',
+                              flexShrink: 0,
+                              flexGrow: 0,
+                            },
                           }}
                         >
-                          {tool.languages?.join(', ')}
+                          {bowtieReport && (
+                            <div className='flex justify-center items-center h-full m-auto'>
+                              {bowtieData ? (
+                                <a
+                                  className='flex justify-center items-center h-full'
+                                  href={`https://bowtie.report/#/implementations/${bowtieData.id}`}
+                                  target='blank'
+                                  onClick={(event) => event.stopPropagation()}
+                                  title='See at Bowtie'
+                                >
+                                  <OutLinkIcon className='fill-none stroke-current w-5 h-5 stroke-2' />
+                                </a>
+                              ) : (
+                                <InfoIcon className='fill-none stroke-current w-5 h-5 stroke-2' />
+                              )}
+                            </div>
+                          )}
                         </TableCell>
-                      )}
-                      <TableCell
-                        attributes={{
-                          className: '!block !px-0',
-                          style: { flexBasis: '20%', flexGrow: 1 },
-                        }}
-                      >
-                        {tool.supportedDialects?.draft?.map((draft) => {
-                          return <Badge key={draft}>{draft}</Badge>;
-                        })}
-                      </TableCell>
-                      <TableCell attributes={{ style: { flexBasis: '15%' } }}>
-                        {tool.license}
-                      </TableCell>
-                      <TableCell
-                        attributes={{
-                          className: 'text-center !px-0',
-                          style: {
-                            flexBasis: '70px',
-                            flexShrink: 0,
-                            flexGrow: 0,
-                          },
-                        }}
-                      >
-                        {bowtieReport && (
-                          <div className='flex justify-center items-center h-full m-auto'>
-                            {bowtieData ? (
-                              <a
-                                className='flex justify-center items-center h-full'
-                                href={`https://bowtie.report/#/implementations/${bowtieData.id}`}
-                                target='blank'
-                                onClick={(event) => event.stopPropagation()}
-                                title='See at Bowtie'
-                              >
-                                <OutLinkIcon className='fill-none stroke-current w-5 h-5 stroke-2' />
-                              </a>
-                            ) : (
-                              <InfoIcon className='fill-none stroke-current w-5 h-5 stroke-2' />
-                            )}
-                          </div>
-                        )}
-                      </TableCell>
-                    </tr>
-                  );
-                })}
+                      </tr>
+                    );
+                  },
+                )}
               </tbody>
             </table>
 
             {/* Mobile Table */}
             <table className='lg:hidden min-w-full bg-white dark:bg-slate-800 border border-gray-200'>
               <tbody>
-                {toolsByGroup[group].map((tool: JSONSchemaTool, index) => {
-                  const bowtieData = getBowtieData(tool);
-                  if (bowtieData) {
-                    tool.bowtie = bowtieData;
-                  }
-                  return (
-                    <tr
-                      key={index}
-                      className='border-b border-gray-200 hover:bg-gray-100 dark:hover:bg-slate-700 cursor-pointer'
-                      onClick={() => openModal(tool)}
-                    >
-                      <td className='p-2 relative'>
-                        {bowtieData && (
-                          <div className='absolute top-0 right-0 m-2 text-sm text-gray-600 dark:text-gray-300 flex items-center'>
-                            <span>Bowtie:</span>
-                            <a
-                              href={`https://bowtie.report/#/implementations/${bowtieData.id}`}
-                              target='blank'
-                              onClick={(event) => event.stopPropagation()}
-                              title='See at Bowtie'
-                              className='ml-1'
-                            >
-                              <OutLinkIcon className='fill-none stroke-current w-5 h-5 stroke-2' />
-                            </a>
-                          </div>
-                        )}
+                {(filteredToolsByGroup[group] ?? []).map(
+                  (tool: JSONSchemaTool, index) => {
+                    const bowtieData = getBowtieData(tool);
+                    return (
+                      <tr
+                        key={index}
+                        className='border-b border-gray-200 hover:bg-gray-100 dark:hover:bg-slate-700 cursor-pointer'
+                        onClick={() => openModal(tool)}
+                      >
+                        <td className='p-2 relative'>
+                          {bowtieReport && (
+                            <div className='absolute top-0 right-0 m-2 text-sm text-gray-600 dark:text-gray-300 flex items-center'>
+                              <span>Bowtie:</span>
+                              {bowtieData ? (
+                                <a
+                                  href={`https://bowtie.report/#/implementations/${bowtieData.id}`}
+                                  target='blank'
+                                  onClick={(event) => event.stopPropagation()}
+                                  title='See at Bowtie'
+                                  className='ml-1'
+                                >
+                                  <OutLinkIcon className='fill-none stroke-current w-5 h-5 stroke-2' />
+                                </a>
+                              ) : (
+                                <InfoIcon className='fill-none stroke-current w-5 h-5 stroke-2' />
+                              )}
+                            </div>
+                          )}
 
-                        <div className='flex justify-between items-center'>
-                          <div className='font-medium'>
-                            {tool.name}
-                            {tool.status === 'obsolete' && (
-                              <Tag intent='error'>{tool.status}</Tag>
-                            )}
+                          <div className='flex justify-between items-center'>
+                            <div className='font-medium'>
+                              {tool.name}
+                              {tool.status === 'obsolete' && (
+                                <Tag intent='error'>{tool.status}</Tag>
+                              )}
+                            </div>
+                          </div>
+                          <div className='text-sm text-gray-600 dark:text-gray-300 mt-1'>
+                            Languages: {tool.languages?.join(', ')}
+                          </div>
+                          <div className='text-sm text-gray-600 dark:text-gray-300 mt-1'>
+                            Supported Dialects:
+                          </div>
+                          <div className='flex flex-wrap gap-1 mt-1'>
+                            {tool.supportedDialects?.draft?.map((draft) => (
+                              <Badge key={draft}>{draft}</Badge>
+                            ))}
+                          </div>
+                          <div className='text-sm text-gray-600 dark:text-gray-300 mt-1'>
+                            License: {tool.license}
                           </div>
-                        </div>
-                        <div className='text-sm text-gray-600 dark:text-gray-300 mt-1'>
-                          Languages: {tool.languages?.join(', ')}
-                        </div>
-                        <div className='text-sm text-gray-600 dark:text-gray-300 mt-1'>
-                          Supported Dialects:
-                        </div>
-                        <div className='flex flex-wrap gap-1 mt-1'>
-                          {tool.supportedDialects?.draft?.map((draft) => (
-                            <Badge key={draft}>{draft}</Badge>
-                          ))}
-                        </div>
-                        <div className='text-sm text-gray-600 dark:text-gray-300 mt-1'>
-                          License: {tool.license}
-                        </div>
-                      </td>
-                    </tr>
-                  );
-                })}
+                        </td>
+                      </tr>
+                    );
+                  },
+                )}
               </tbody>
             </table>
           </div>
diff --git a/pages/tools/components/ui/Checkbox.tsx b/pages/tools/components/ui/Checkbox.tsx
index 4337e945a..a1f2f6ab0 100644
--- a/pages/tools/components/ui/Checkbox.tsx
+++ b/pages/tools/components/ui/Checkbox.tsx
@@ -21,7 +21,7 @@ export default function Checkbox({
       <ShadcnCheckbox
         value={value}
         name={name}
-        defaultChecked={checked}
+        checked={checked}
         disabled={disabled}
         onCheckedChange={onChange}
         className='h-5 w-5 border data-[state=checked]:bg-blue-500 data-[state=checked]:border-blue-500 data-[state=checked]:text-white dark:data-[state=checked]:bg-[#bfdbfe] dark:data-[state=checked]:border-[#bfdbfe] dark:data-[state=checked]:text-black border-gray-500 dark:border-slate-600'
diff --git a/pages/tools/hooks/useToolsTransform.tsx b/pages/tools/hooks/useToolsTransform.tsx
index 5c8ec0e72..04991b1d0 100644
--- a/pages/tools/hooks/useToolsTransform.tsx
+++ b/pages/tools/hooks/useToolsTransform.tsx
@@ -90,10 +90,8 @@ export default function useToolsTransform(tools: JSONSchemaTool[]) {
       environments: parseArrayParam(
         query.environments,
       ) as Transform['environments'],
-      showObsolete:
-        (query.showObsolete as Transform['showObsolete']) || 'false',
-      supportsBowtie:
-        (query.supportsBowtie as Transform['supportsBowtie']) || 'false',
+      showObsolete: query.showObsolete === 'true' ? 'true' : 'false',
+      supportsBowtie: query.supportsBowtie === 'true' ? 'true' : 'false',
     } satisfies Transform;
 
     const queryString = buildQueryString(updatedTransform);
@@ -199,9 +197,6 @@ const filterTools = (
   transform: Transform,
 ): JSONSchemaTool[] => {
   const filteredTools = tools.filter((tool) => {
-    if (transform.supportsBowtie === 'true' && !tool.bowtie?.id) {
-      return false;
-    }
     if (transform.showObsolete === 'false' && tool.status === 'obsolete')
       return false;
 
diff --git a/pages/tools/index.page.tsx b/pages/tools/index.page.tsx
index 563a15d8c..c254e5051 100644
--- a/pages/tools/index.page.tsx
+++ b/pages/tools/index.page.tsx
@@ -103,6 +103,7 @@ export default function ToolingPage({
 }: ToolingPageProps) {
   const [isSidebarOpen, setIsSidebarOpen] = useState(false);
   const [isMobile, setIsMobile] = useState(false);
+  const [visibleToolCount, setVisibleToolCount] = useState<number>(0);
 
   useEffect(() => {
     const handleResize = () => {
@@ -132,7 +133,7 @@ export default function ToolingPage({
           className='bg-primary w-full h-12 mt-[4.5rem] relative lg:hidden px-8 flex justify-between items-center'
           onClick={() => setIsSidebarOpen((prev) => !prev)}
         >
-          <h3 className='text-white'>{numberOfTools} Tools</h3>
+          <h3 className='text-white'>{visibleToolCount} Tools</h3>
 
           <svg
             style={{
@@ -182,7 +183,7 @@ export default function ToolingPage({
               <div className='flex-1 overflow-y-auto scrollbar-hidden min-h-0 px-2 lg:px-0 pb-2'>
                 <div className='hidden lg:block pt-8'>
                   <h1 className='text-h1mobile md:text-h1 font-bold lg:ml-4'>
-                    {numberOfTools}
+                    {visibleToolCount}
                   </h1>
                   <div className='text-xl text-slate-900 dark:text-slate-300 font-bold lg:ml-6 mb-4'>
                     Tools
@@ -266,6 +267,7 @@ export default function ToolingPage({
               transform={transform}
               setTransform={setTransform}
               numberOfTools={numberOfTools}
+              onVisibleToolCountChange={setVisibleToolCount}
             />
 
             <DocsHelp />