diff --git a/src/frontend/src/tables/FilterSelectDrawer.tsx b/src/frontend/src/tables/FilterSelectDrawer.tsx
index b5be497869..841c420fb5 100644
--- a/src/frontend/src/tables/FilterSelectDrawer.tsx
+++ b/src/frontend/src/tables/FilterSelectDrawer.tsx
@@ -82,17 +82,19 @@ function FilterAddGroup({
   tableState: TableState;
   availableFilters: TableFilter[];
 }) {
-  const filterOptions = useMemo(() => {
+  const filterOptions: TableFilterChoice[] = useMemo(() => {
     let activeFilterNames =
       tableState.activeFilters?.map((flt) => flt.name) ?? [];
 
-    return availableFilters
-      .filter((flt) => !activeFilterNames.includes(flt.name))
-      .map((flt) => ({
-        value: flt.name,
-        label: flt.label,
-        description: flt.description
-      }));
+    return (
+      availableFilters
+        ?.filter((flt) => !activeFilterNames.includes(flt.name))
+        ?.map((flt) => ({
+          value: flt.name,
+          label: flt.label,
+          description: flt.description
+        })) ?? []
+    );
   }, [tableState.activeFilters, availableFilters]);
 
   const [selectedFilter, setSelectedFilter] = useState<string | null>(null);
diff --git a/src/frontend/src/tables/stock/StockItemTestResultTable.tsx b/src/frontend/src/tables/stock/StockItemTestResultTable.tsx
index a7fb6eebfb..ba38d376ce 100644
--- a/src/frontend/src/tables/stock/StockItemTestResultTable.tsx
+++ b/src/frontend/src/tables/stock/StockItemTestResultTable.tsx
@@ -28,7 +28,7 @@ import { useTable } from '../../hooks/UseTable';
 import { apiUrl } from '../../states/ApiState';
 import { useUserState } from '../../states/UserState';
 import { TableColumn } from '../Column';
-import { DescriptionColumn, NoteColumn } from '../ColumnRenderers';
+import { DateColumn, DescriptionColumn, NoteColumn } from '../ColumnRenderers';
 import { TableFilter } from '../Filter';
 import { InvenTreeTable } from '../InvenTreeTable';
 import { RowActions, RowDeleteAction, RowEditAction } from '../RowActions';
@@ -188,20 +188,13 @@ export default function StockItemTestResultTable({
           record.attachment && <AttachmentLink attachment={record.attachment} />
       },
       NoteColumn(),
+      DateColumn({}),
       {
-        accessor: 'date',
-        sortable: true,
-        title: t`Date`,
-        render: (record: any) => {
-          return (
-            <Group justify="space-between">
-              {renderDate(record.date)}
-              {record.user_detail && (
-                <RenderUser instance={record.user_detail} />
-              )}
-            </Group>
-          );
-        }
+        accessor: 'user',
+        title: t`User`,
+        sortable: false,
+        render: (record: any) =>
+          record.user_detail && <RenderUser instance={record.user_detail} />
       },
       {
         accessor: 'test_station',