diff --git a/src/components/table/DataTableToolTipButton.tsx b/src/components/table/DataTableToolTipButton.tsx
new file mode 100644
index 00000000..c6acebbf
--- /dev/null
+++ b/src/components/table/DataTableToolTipButton.tsx
@@ -0,0 +1,48 @@
+import Button from "@components/Button";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@components/Tooltip";
+import { motion } from "framer-motion";
+import { RefreshCcw } from "lucide-react";
+import * as React from "react";
+import { useState } from "react";
+
+type Props = {
+  onClick: () => void;
+  disabled?: boolean;
+  variant?: "default" | "primary" | "secondary" | "input" | "dotted" | "tertiary" | "white" | "outline" | "danger-outline" | "default-outline" | "danger" | null | undefined;
+  title?:any;
+  children: any;
+};
+export default function DataTableToolTipButton({ onClick, disabled, variant, title, children }: Props) {
+  const [rotate, setRotate] = useState(false);
+  //const [disabled, setDisabled] = useState(false);
+  const [hovered, setHovered] = useState(false);
+
+  return (
+    <Tooltip>
+      <TooltipTrigger
+        asChild={true}
+      >
+        <Button
+          className={"h-[42px]"}
+          variant={variant}
+          disabled={disabled == true ? true : disabled}
+          onClick={onClick}
+        >
+            {children}
+        </Button>
+      </TooltipTrigger>
+
+      <TooltipContent
+        sideOffset={10}
+        className={"px-3 py-2"}
+        onPointerDownOutside={(event) => {
+          if (hovered) event.preventDefault();
+        }}
+      >
+        <span className={"text-xs text-neutral-300"}>
+          {title}
+        </span>
+      </TooltipContent>
+    </Tooltip>
+  );
+}
diff --git a/src/modules/groups/AssignPeerToGroupModal.tsx b/src/modules/groups/AssignPeerToGroupModal.tsx
index 9e15305b..493dbb51 100644
--- a/src/modules/groups/AssignPeerToGroupModal.tsx
+++ b/src/modules/groups/AssignPeerToGroupModal.tsx
@@ -367,6 +367,6 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     header: ({ column }) => {
       return <DataTableHeader column={column}>OS</DataTableHeader>;
     },
-    cell: ({ row }) => <PeerOSCell os={row.original.os} />,
+    cell: ({ row }) => <PeerOSCell os={row.original.os} serial={row.original.serial_number} />,
   },
 ];
diff --git a/src/modules/peers/PeerOSCell.tsx b/src/modules/peers/PeerOSCell.tsx
index 85df9933..a9f1ad8d 100644
--- a/src/modules/peers/PeerOSCell.tsx
+++ b/src/modules/peers/PeerOSCell.tsx
@@ -13,8 +13,9 @@ import AppleLogo from "@/assets/os-icons/apple.svg";
 import FreeBSDLogo from "@/assets/os-icons/FreeBSD.png";
 import { getOperatingSystem } from "@/hooks/useOperatingSystem";
 import { OperatingSystem } from "@/interfaces/OperatingSystem";
+import { Barcode, Laptop } from "lucide-react";
 
-export function PeerOSCell({ os }: { os: string }) {
+export function PeerOSCell({ os, serial }: { os: string, serial?: string }) {
   return (
     <TooltipProvider>
       <Tooltip delayDuration={1}>
@@ -34,13 +35,50 @@ export function PeerOSCell({ os }: { os: string }) {
           </div>
         </TooltipTrigger>
         <TooltipContent>
-          <div className={"text-neutral-300 flex flex-col gap-1"}>{os}</div>
+          <ListItem
+            icon={<Laptop size={14} />}
+            label={"OS"}
+            value={os}
+          />
+          { (serial !== undefined) &&
+          <ListItem
+
+            icon={<Barcode size={14} />}
+            label={"Serial"}
+            value={serial}
+          />
+          }
         </TooltipContent>
       </Tooltip>
     </TooltipProvider>
   );
 }
 
+const ListItem = ({
+  icon,
+  label,
+  value,
+}: {
+  icon: React.ReactNode;
+  label: string;
+  value: string | React.ReactNode;
+}) => {
+  return (
+    <div
+      className={
+        "flex justify-between gap-5 border-b border-nb-gray-920 py-2 px-4 last:border-b-0 text-xs"
+      }
+    >
+      <div className={"flex items-center gap-2 text-nb-gray-100 font-medium"}>
+        {icon}
+        {label}
+      </div>
+      <div className={"text-nb-gray-400"}>{value}</div>
+    </div>
+  );
+};
+
+
 export function OSLogo({ os }: { os: string }) {
   const icon = useMemo(() => {
     return getOperatingSystem(os);
diff --git a/src/modules/peers/PeersTable.tsx b/src/modules/peers/PeersTable.tsx
index 3f98c381..a775e7ab 100644
--- a/src/modules/peers/PeersTable.tsx
+++ b/src/modules/peers/PeersTable.tsx
@@ -14,6 +14,7 @@ import {
   ColumnDef,
   RowSelectionState,
   SortingState,
+  VisibilityState,
 } from "@tanstack/react-table";
 import { uniqBy } from "lodash";
 import { ExternalLinkIcon } from "lucide-react";
@@ -21,6 +22,7 @@ import { usePathname } from "next/navigation";
 import React, { useState } from "react";
 import { useSWRConfig } from "swr";
 import PeerIcon from "@/assets/icons/PeerIcon";
+import DataTableToolTipButton from "@/components/table/DataTableToolTipButton";
 import PeerProvider from "@/contexts/PeerProvider";
 import { useLoggedInUser } from "@/contexts/UsersProvider";
 import { useLocalStorage } from "@/hooks/useLocalStorage";
@@ -40,6 +42,7 @@ import PeerVersionCell from "@/modules/peers/PeerVersionCell";
 const PeersTableColumns: ColumnDef<Peer>[] = [
   {
     id: "select",
+    enableHiding: false,
     header: ({ table }) => (
       <div className={"min-w-[20px] max-w-[20px]"}>
         <Checkbox
@@ -60,10 +63,10 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
       </div>
     ),
     enableSorting: false,
-    enableHiding: false,
   },
   {
     accessorKey: "name",
+    enableHiding: false,
     header: ({ column }) => {
       return <DataTableHeader column={column}>Name</DataTableHeader>;
     },
@@ -82,6 +85,7 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     accessorFn: (peer) => peer.connected,
   },
   {
+    id: "ip",
     accessorKey: "ip",
     sortingFn: "text",
   },
@@ -94,6 +98,8 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     accessorFn: (peer) => (peer.user ? peer.user?.email : "Unknown"),
   },
   {
+    id: "dns_label",
+    enableHiding: false,
     accessorKey: "dns_label",
     header: ({ column }) => {
       return <DataTableHeader column={column}>Address</DataTableHeader>;
@@ -101,11 +107,21 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     cell: ({ row }) => <PeerAddressCell peer={row.original} />,
   },
   {
+    id: "group_name_strings",
     accessorKey: "group_name_strings",
     accessorFn: (peer) => peer.groups?.map((g) => g?.name || "").join(", "),
     sortingFn: "text",
   },
   {
+    // used for exact group matching
+    id: "exact_group_name_strings",
+    accessorKey: "exact_group_name_strings",
+    accessorFn: (peer) => peer.groups?.map((g) => g?.name || "").join("|"),
+    sortingFn: "text",
+    filterFn: "equals"
+  },
+  {
+    id: "group_names",
     accessorKey: "group_names",
     accessorFn: (peer) => peer.groups?.map((g) => g?.name || ""),
     sortingFn: "text",
@@ -124,6 +140,7 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     ),
   },
   {
+    id: "last_seen",
     accessorKey: "last_seen",
     header: ({ column }) => {
       return <DataTableHeader column={column}>Last seen</DataTableHeader>;
@@ -132,13 +149,23 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     cell: ({ row }) => <PeerLastSeenCell peer={row.original} />,
   },
   {
+    id: "os",
     accessorKey: "os",
     header: ({ column }) => {
       return <DataTableHeader column={column}>OS</DataTableHeader>;
     },
-    cell: ({ row }) => <PeerOSCell os={row.original.os} />,
+    cell: ({ row }) => <PeerOSCell os={row.original.os} serial={row.original.serial_number} />,
+  },
+  {
+    id: "serial",
+    header: ({ column }) => {
+      return <DataTableHeader column={column}>Serial number</DataTableHeader>;
+    },
+    accessorFn: (peer) => peer.serial_number,
+    sortingFn: "text",
   },
   {
+    id: "version",
     accessorKey: "version",
     header: ({ column }) => {
       return <DataTableHeader column={column}>Version</DataTableHeader>;
@@ -165,8 +192,10 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
   },
   {
     id: "actions",
+    enableHiding: false,
     accessorKey: "id",
     header: "",
+
     cell: ({ row }) => (
       <PeerProvider peer={row.original}>
         <PeerActionCell />
@@ -213,6 +242,25 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
 
   const [selectedRows, setSelectedRows] = useState<RowSelectionState>({});
 
+  const colVisibility: VisibilityState = {
+    select: !isUser,
+    actions: !isUser,
+    groups: !isUser,
+    connected: false,
+    approval_required: false,
+
+    // hidden, but usefull for lookup
+    serial: false,
+    group_name_strings: false,
+    exact_group_name_strings: false,
+    group_names: false,
+    ip: false,
+    user_name: false,
+    user_email: false,
+  }
+
+  const [resultingColumnVisibility, setColumnVisibility] = useState(colVisibility);
+
   const resetSelectedRows = () => {
     if (Object.keys(selectedRows).length > 0) {
       setSelectedRows({});
@@ -226,6 +274,7 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
         onCanceled={() => setSelectedRows({})}
       />
       <DataTable
+        keepStateInLocalStorage={true}
         headingTarget={headingTarget}
         rowSelection={selectedRows}
         setRowSelection={setSelectedRows}
@@ -233,21 +282,11 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
         text={"Peers"}
         sorting={sorting}
         setSorting={setSorting}
+        setColumnVisibility={setColumnVisibility}
         columns={PeersTableColumns}
         data={peers}
-        searchPlaceholder={"Search by name, IP, owner or group..."}
-        columnVisibility={{
-          select: !isUser,
-          connected: false,
-          approval_required: false,
-          group_name_strings: false,
-          group_names: false,
-          ip: false,
-          user_name: false,
-          user_email: false,
-          actions: !isUser,
-          groups: !isUser,
-        }}
+        searchPlaceholder={"Search by name, IP, Serial, owner or group..."}
+        columnVisibility={resultingColumnVisibility}
         isLoading={isLoading}
         getStartedCard={
           <GetStartedTest
@@ -393,7 +432,7 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
                   table.setPageIndex(0);
                   let current =
                     table.getColumn("approval_required")?.getFilterValue() ===
-                    undefined
+                      undefined
                       ? true
                       : undefined;
 
@@ -412,7 +451,7 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
                 }}
                 variant={
                   table.getColumn("approval_required")?.getFilterValue() ===
-                  true
+                    true
                     ? "tertiary"
                     : "secondary"
                 }
@@ -446,6 +485,29 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
               />
             )}
 
+            <DataTableToolTipButton
+              disabled={peers?.length == 0}
+              onClick={() => {
+                table.setPageIndex(0);
+                if (table.getColumn("exact_group_name_strings")?.getFilterValue() !== undefined) {
+                  table.resetColumnFilters();
+                  return;
+                }
+                table.setColumnFilters([
+                  {
+                    id: "exact_group_name_strings",
+                    value: "All"
+                  }
+                ])
+              }}
+              variant={table.getColumn("exact_group_name_strings")?.getFilterValue() !== undefined
+                ? "tertiary"
+                : "secondary"}
+              title="filter peers assigned to the uniq group: 'All'"
+            >
+              All group only
+            </DataTableToolTipButton>
+
             <DataTableRefreshButton
               isDisabled={peers?.length == 0}
               onClick={() => {