diff --git a/ui/litellm-dashboard/src/components/all_keys_table.tsx b/ui/litellm-dashboard/src/components/all_keys_table.tsx
index bc0d1135ea7..05bb227e011 100644
--- a/ui/litellm-dashboard/src/components/all_keys_table.tsx
+++ b/ui/litellm-dashboard/src/components/all_keys_table.tsx
@@ -325,12 +325,12 @@ export function AllKeysTable({
         if (!allOrganizations || allOrganizations.length === 0) return [];
         
         const filteredOrgs = allOrganizations.filter(org => 
-          org.organization_id.toLowerCase().includes(searchText.toLowerCase()) || 
-          (org.organization_name && org.organization_name.toLowerCase().includes(searchText.toLowerCase()))
+          (org.organization_id?.toLowerCase().includes(searchText.toLowerCase())) || 
+          (org.organization_id && org.organization_id.toLowerCase().includes(searchText.toLowerCase()))
         );
         
         return filteredOrgs.map(org => ({
-          label: `${org.organization_name || 'Unknown'} (${org.organization_id})`,
+          label: `${org.organization_id || 'Unknown'} (${org.organization_id})`,
           value: org.organization_id
         }));
       }
@@ -385,8 +385,8 @@ export function AllKeysTable({
           <div className="h-[75vh] overflow-auto">
             
             <DataTable
-              columns={columns.filter(col => col.id !== 'expander')}
-              data={filteredKeys}
+              columns={columns.filter(col => col.id !== 'expander') as any}
+              data={filteredKeys as any}
               isLoading={isLoading}
               getRowCanExpand={() => false}
               renderSubComponent={() => <></>}
diff --git a/ui/litellm-dashboard/src/components/view_logs/columns.tsx b/ui/litellm-dashboard/src/components/view_logs/columns.tsx
index a4004da2e9e..fd72c0f3a7e 100644
--- a/ui/litellm-dashboard/src/components/view_logs/columns.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/columns.tsx
@@ -37,41 +37,7 @@ export const columns: ColumnDef<LogEntry>[] = [
     id: "expander",
     header: () => null,
     cell: ({ row }) => {
-      const [localExpanded, setLocalExpanded] = React.useState(row.getIsExpanded());
-
-      // Memoize the toggle handler to prevent unnecessary re-renders
-      const toggleHandler = React.useCallback(() => {
-        setLocalExpanded((prev) => !prev);
-        row.getToggleExpandedHandler()();
-      }, [row]);
-
-      return row.getCanExpand() ? (
-        <button
-          onClick={toggleHandler}
-          style={{ cursor: "pointer" }}
-          aria-label={localExpanded ? "Collapse row" : "Expand row"}
-          className="w-6 h-6 flex items-center justify-center focus:outline-none"
-        >
-          <svg
-            className={`w-4 h-4 transform transition-transform duration-75 ${
-              localExpanded ? 'rotate-90' : ''
-            }`}
-            fill="none"
-            stroke="currentColor"
-            viewBox="0 0 24 24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              strokeLinecap="round"
-              strokeLinejoin="round"
-              strokeWidth={2}
-              d="M9 5l7 7-7 7"
-            />
-          </svg>
-        </button>
-      ) : (
-        <span className="w-6 h-6 flex items-center justify-center">●</span>
-      );
+      return <ExpanderCell row={row} />;
     },
   },
   {
@@ -249,6 +215,44 @@ export const columns: ColumnDef<LogEntry>[] = [
   },
 ];
 
+const ExpanderCell = ({ row }: { row: any }) => {
+  const [localExpanded, setLocalExpanded] = React.useState(row.getIsExpanded());
+
+  // Memoize the toggle handler to prevent unnecessary re-renders
+  const toggleHandler = React.useCallback(() => {
+    setLocalExpanded((prev: boolean) => !prev);
+    row.getToggleExpandedHandler()();
+  }, [row]);
+
+  return row.getCanExpand() ? (
+    <button
+      onClick={toggleHandler}
+      style={{ cursor: "pointer" }}
+      aria-label={localExpanded ? "Collapse row" : "Expand row"}
+      className="w-6 h-6 flex items-center justify-center focus:outline-none"
+    >
+      <svg
+        className={`w-4 h-4 transform transition-transform duration-75 ${
+          localExpanded ? 'rotate-90' : ''
+        }`}
+        fill="none"
+        stroke="currentColor"
+        viewBox="0 0 24 24"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth={2}
+          d="M9 5l7 7-7 7"
+        />
+      </svg>
+    </button>
+  ) : (
+    <span className="w-6 h-6 flex items-center justify-center">●</span>
+  );
+};
+
 const formatMessage = (message: any): string => {
   if (!message) return "N/A";
   if (typeof message === "string") return message;