diff --git a/packages/diracx-web-components/components/JobMonitor/JobDataService.ts b/packages/diracx-web-components/components/JobMonitor/JobDataService.ts
index caa4b18c..623be8fd 100644
--- a/packages/diracx-web-components/components/JobMonitor/JobDataService.ts
+++ b/packages/diracx-web-components/components/JobMonitor/JobDataService.ts
@@ -1,8 +1,23 @@
 import useSWR, { mutate } from "swr";
 import { fetcher } from "@/hooks/utils";
-import { Filter } from "@/types";
 import dayjs from "dayjs";
 
+function processSearchBody(searchBody: any) {
+  searchBody.search = searchBody.search?.map((filter: any) => {
+    if (filter.operator == "last") {
+      return {
+        parameter: filter.parameter,
+        operator: "gt",
+        value: dayjs()
+          .subtract(1, filter.value as "hour" | "day" | "month" | "year")
+          .toISOString(),
+        values: filter.values,
+      };
+    }
+    return filter;
+  });
+}
+
 /**
  * Custom hook for fetching jobs data.
  *
@@ -18,19 +33,7 @@ export const useJobs = (
   page: number,
   rowsPerPage: number,
 ) => {
-  searchBody.search = searchBody.search?.map((filter: any) => {
-    if (filter.operator == "last") {
-      return {
-        column: filter.column,
-        operator: "gt",
-        value: dayjs()
-          .subtract(1, filter.value as "hour" | "day" | "month" | "year")
-          .toISOString(),
-        values: filter.values,
-      };
-    }
-    return filter;
-  });
+  processSearchBody(searchBody);
   const urlGetJobs = `/api/jobs/search?page=${page + 1}&per_page=${rowsPerPage}`;
   return useSWR([urlGetJobs, accessToken, "POST", searchBody], fetcher);
 };
@@ -49,19 +52,7 @@ export const refreshJobs = (
   page: number,
   rowsPerPage: number,
 ) => {
-  searchBody.search = searchBody.search?.map((filter: any) => {
-    if (filter.operator == "last") {
-      return {
-        column: filter.column,
-        operator: "gt",
-        value: dayjs()
-          .subtract(1, filter.value as "hour" | "day" | "month" | "year")
-          .toISOString(),
-        values: filter.values,
-      };
-    }
-    return filter;
-  });
+  processSearchBody(searchBody);
   const urlGetJobs = `/api/jobs/search?page=${page + 1}&per_page=${rowsPerPage}`;
   mutate([urlGetJobs, accessToken, "POST", searchBody]);
 };
diff --git a/packages/diracx-web-components/components/JobMonitor/JobDataTable.tsx b/packages/diracx-web-components/components/JobMonitor/JobDataTable.tsx
index 73ee1f39..04e22993 100644
--- a/packages/diracx-web-components/components/JobMonitor/JobDataTable.tsx
+++ b/packages/diracx-web-components/components/JobMonitor/JobDataTable.tsx
@@ -40,28 +40,28 @@ import {
   useJobs,
 } from "./JobDataService";
 
+const statusColors: { [key: string]: string } = {
+  Submitting: purple[500],
+  Received: blueGrey[500],
+  Checking: teal[500],
+  Staging: lightBlue[500],
+  Waiting: amber[600],
+  Matched: blue[300],
+  Running: blue[900],
+  Rescheduled: lime[700],
+  Completing: orange[500],
+  Completed: green[300],
+  Done: green[500],
+  Failed: red[500],
+  Stalled: amber[900],
+  Killed: red[900],
+  Deleted: grey[500],
+};
+
 /**
  * Renders the status cell with colors
  */
 const renderStatusCell = (status: string) => {
-  const statusColors: { [key: string]: string } = {
-    Submitting: purple[500],
-    Received: blueGrey[500],
-    Checking: teal[500],
-    Staging: lightBlue[500],
-    Waiting: amber[600],
-    Matched: blue[300],
-    Running: blue[900],
-    Rescheduled: lime[700],
-    Completing: orange[500],
-    Completed: green[300],
-    Done: green[500],
-    Failed: red[500],
-    Stalled: amber[900],
-    Killed: red[900],
-    Deleted: grey[500],
-  };
-
   return (
     <Box
       sx={{
@@ -89,23 +89,7 @@ const headCells: Column[] = [
     id: "Status",
     label: "Status",
     render: renderStatusCell,
-    type: [
-      "Submitting",
-      "Received",
-      "Checking",
-      "Staging",
-      "Waiting",
-      "Matched",
-      "Running",
-      "Rescheduled",
-      "Completing",
-      "Completed",
-      "Done",
-      "Failed",
-      "Stalled",
-      "Killed",
-      "Deleted",
-    ].sort(),
+    type: Object.keys(statusColors).sort(),
   },
   {
     id: "MinorStatus",
diff --git a/packages/diracx-web-components/components/shared/DataTable.tsx b/packages/diracx-web-components/components/shared/DataTable.tsx
index cb66eee8..86bc0258 100644
--- a/packages/diracx-web-components/components/shared/DataTable.tsx
+++ b/packages/diracx-web-components/components/shared/DataTable.tsx
@@ -32,7 +32,6 @@ import { Filter } from "@/types/Filter";
 import { Column } from "@/types/Column";
 import { useSearchParamsUtils } from "@/hooks/searchParamsUtils";
 import { ApplicationsContext } from "@/contexts/ApplicationsProvider";
-import dayjs from "dayjs";
 import { FilterToolbar } from "./FilterToolbar";
 
 /**
diff --git a/packages/diracx-web-components/components/shared/FilterForm.tsx b/packages/diracx-web-components/components/shared/FilterForm.tsx
index 9dd13514..27bf8be4 100644
--- a/packages/diracx-web-components/components/shared/FilterForm.tsx
+++ b/packages/diracx-web-components/components/shared/FilterForm.tsx
@@ -17,7 +17,7 @@ import { Column } from "@/types/Column";
 import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers";
 import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import dayjs from "dayjs";
-import "dayjs/locale/en-gb";
+import "dayjs/locale/en-gb"; // needed by LocalizationProvider to format Dates to dd-mm-yyyy
 
 /**
  * Filter form props
@@ -102,6 +102,185 @@ export function FilterForm(props: FilterFormProps) {
 
   const selectedColumn = columns.find((c) => c.id == tempFilter.column);
 
+  const types: {
+    [type: string]: { operators: string[]; defaultOperator: string };
+  } = {
+    DateTime: { operators: ["last", "gt", "lt"], defaultOperator: "last" },
+    category: {
+      operators: ["eq", "neq", "in", "not in", "like"],
+      defaultOperator: "eq",
+    },
+    number: {
+      operators: ["eq", "neq", "gt", "lt", "like"],
+      defaultOperator: "eq",
+    },
+    default: {
+      operators: ["eq", "neq", "gt", "lt", "like"],
+      defaultOperator: "eq",
+    },
+  };
+
+  const operatorText: { [operator: string]: string } = {
+    eq: "equals to",
+    neq: "not equals to",
+    last: "in the last",
+    gt: "is greater than",
+    lt: "is lower than",
+    in: "is in",
+    "not in": "is not in",
+    like: "like",
+  };
+
+  function operatorSelector() {
+    if (tempFilter)
+      return (
+        <FormControl variant="outlined">
+          <InputLabel id="operator">Operator</InputLabel>
+          <Select
+            value={tempFilter.operator}
+            onChange={(e) => {
+              onChange(
+                ["in", "not in"].includes(e.target.value) ? "values" : "value",
+                [] || "",
+              );
+              onChange(
+                ["in", "not in"].includes(e.target.value) ? "value" : "values",
+                undefined,
+              );
+              onChange("operator", e.target.value);
+            }}
+            label="Operator"
+            labelId="operator"
+            data-testid="filter-form-select-operator"
+            sx={{ minWidth: 120 }}
+          >
+            {types[
+              typeof selectedColumn?.type == "object"
+                ? "category"
+                : selectedColumn?.type || "default"
+            ].operators.map((operator) => (
+              <MenuItem key={operator} value={operator}>
+                {operatorText[operator]}
+              </MenuItem>
+            ))}
+          </Select>
+        </FormControl>
+      );
+  }
+
+  function valueSelector() {
+    if (!tempFilter) return null;
+    if (selectedColumn?.type == "DateTime") {
+      if (tempFilter.operator != "last")
+        return (
+          <LocalizationProvider
+            dateAdapter={AdapterDayjs}
+            adapterLocale={"en-gb"}
+          >
+            <FormControl variant="outlined">
+              <DateTimePicker
+                label="Value"
+                value={dayjs(tempFilter.value)}
+                onChange={(e) => onChange("value", e?.toISOString() || "")}
+                views={["year", "day", "hours", "minutes", "seconds"]}
+              />
+            </FormControl>
+          </LocalizationProvider>
+        );
+      else
+        return (
+          <FormControl variant="outlined">
+            <InputLabel id="value">Value</InputLabel>
+            <Select
+              label="Value"
+              labelId="value"
+              value={tempFilter.value}
+              onChange={(e) => onChange("value", e.target.value)}
+              sx={{ minWidth: 100 }}
+            >
+              <MenuItem value="hour">Hour</MenuItem>
+              <MenuItem value="week">Week</MenuItem>
+              <MenuItem value="month">Month</MenuItem>
+              <MenuItem value="year">Year</MenuItem>
+            </Select>
+          </FormControl>
+        );
+    }
+
+    if (
+      typeof selectedColumn?.type == "object" &&
+      tempFilter.operator != "like"
+    )
+      return (
+        <FormControl variant="outlined">
+          <InputLabel id="value">Value</InputLabel>
+          <Select
+            label="Value"
+            labelId="value"
+            value={
+              ["in", "not in"].includes(tempFilter.operator)
+                ? tempFilter.values
+                : tempFilter.value
+            }
+            onChange={(e) =>
+              onChange(
+                ["in", "not in"].includes(tempFilter.operator)
+                  ? "values"
+                  : "value",
+                e.target.value,
+              )
+            }
+            multiple={["in", "not in"].includes(tempFilter.operator)}
+            sx={{ minWidth: 100 }}
+          >
+            {selectedColumn?.type.map((val: string) => (
+              <MenuItem key={val} value={val}>
+                {selectedColumn.render ? selectedColumn.render(val) : val}
+              </MenuItem>
+            ))}
+          </Select>
+        </FormControl>
+      );
+    if (selectedColumn?.type == "number") {
+      if (!["in", "not in", "like"].includes(tempFilter.operator))
+        return (
+          <FormControl variant="outlined">
+            <TextField
+              id="value"
+              variant="outlined"
+              label="Value"
+              value={tempFilter.value}
+              onChange={(e) => onChange("value", e.target.value)}
+              type="number"
+            />
+          </FormControl>
+        );
+      else if (["in", "not in"].includes(tempFilter.operator))
+        return (
+          <FormControl variant="outlined">
+            <TextField
+              id="value"
+              variant="outlined"
+              label="Value"
+              value={tempFilter.values?.join(" ")}
+              onChange={(e) => onChange("values", e.target.value.split(" "))}
+            />
+          </FormControl>
+        );
+    }
+    return (
+      <FormControl variant="outlined">
+        <TextField
+          id="value"
+          variant="outlined"
+          label="Value"
+          value={tempFilter.value}
+          onChange={(e) => onChange("value", e.target.value)}
+        />
+      </FormControl>
+    );
+  }
+
   return (
     <Box sx={{ p: 2 }}>
       <Stack spacing={2} alignItems="flex-start">
@@ -115,16 +294,16 @@ export function FilterForm(props: FilterFormProps) {
               value={tempFilter.column}
               onChange={(e) => {
                 onChange("column", e.target.value);
-                console.log(columns.find((c) => c.id == e.target.value)?.type);
-                if (
-                  columns.find((c) => c.id == e.target.value)?.type ==
-                  "DateTime"
-                )
-                  onChange("operator", "last");
-                else if (tempFilter.operator == "last") {
-                  onChange("operator", "eq");
-                  onChange("value", "");
-                }
+                onChange(
+                  "operator",
+                  types[
+                    typeof columns.find((v) => v.id == e.target.value)?.type ==
+                    "object"
+                      ? "category"
+                      : (columns.find((v) => v.id == e.target.value)
+                          ?.type as string) || "default"
+                  ]?.defaultOperator,
+                );
               }}
               label="Column"
               labelId="column"
@@ -139,155 +318,9 @@ export function FilterForm(props: FilterFormProps) {
             </Select>
           </FormControl>
 
-          <FormControl variant="outlined">
-            <InputLabel id="operator">Operator</InputLabel>
-            <Select
-              value={tempFilter.operator}
-              onChange={(e) => {
-                onChange(
-                  ["in", "not in"].includes(e.target.value)
-                    ? "values"
-                    : "value",
-                  [] || "",
-                );
-                onChange(
-                  ["in", "not in"].includes(e.target.value)
-                    ? "value"
-                    : "values",
-                  undefined,
-                );
-                onChange("operator", e.target.value);
-              }}
-              label="Operator"
-              labelId="operator"
-              data-testid="filter-form-select-operator"
-              sx={{ minWidth: 120 }}
-            >
-              {selectedColumn?.type != "DateTime" && (
-                <MenuItem value="eq">equals to</MenuItem>
-              )}
-              {selectedColumn?.type != "DateTime" && (
-                <MenuItem value="neq">not equals to</MenuItem>
-              )}
-
-              {selectedColumn?.type == "DateTime" && (
-                <MenuItem value="last">in the last</MenuItem>
-              )}
-
-              {typeof selectedColumn?.type != "object" && (
-                <MenuItem value="gt">is greater than</MenuItem>
-              )}
-              {typeof selectedColumn?.type != "object" && (
-                <MenuItem value="lt">is lower than</MenuItem>
-              )}
-              {(typeof selectedColumn?.type == "object" ||
-                selectedColumn?.type == "number") && (
-                <MenuItem value="in">is in</MenuItem>
-              )}
-              {(typeof selectedColumn?.type == "object" ||
-                selectedColumn?.type == "number") && (
-                <MenuItem value="not in">is not in</MenuItem>
-              )}
-              {selectedColumn?.type != "DateTime" && (
-                <MenuItem value="like">like</MenuItem>
-              )}
-            </Select>
-          </FormControl>
+          {operatorSelector()}
 
-          <LocalizationProvider
-            dateAdapter={AdapterDayjs}
-            adapterLocale={"en-gb"}
-          >
-            <FormControl variant="outlined">
-              {typeof selectedColumn?.type == "object" &&
-              tempFilter.operator != "like" ? (
-                <>
-                  <InputLabel id="value">Value</InputLabel>
-                  <Select
-                    label="Value"
-                    labelId="value"
-                    value={
-                      ["in", "not in"].includes(tempFilter.operator)
-                        ? tempFilter.values
-                        : tempFilter.value
-                    }
-                    onChange={(e) =>
-                      onChange(
-                        ["in", "not in"].includes(tempFilter.operator)
-                          ? "values"
-                          : "value",
-                        e.target.value,
-                      )
-                    }
-                    multiple={["in", "not in"].includes(tempFilter.operator)}
-                    sx={{ minWidth: 100 }}
-                  >
-                    {selectedColumn?.type.map((val: string) => (
-                      <MenuItem key={val} value={val}>
-                        {selectedColumn.render
-                          ? selectedColumn.render(val)
-                          : val}
-                      </MenuItem>
-                    ))}
-                  </Select>
-                </>
-              ) : selectedColumn?.type == "DateTime" &&
-                tempFilter.operator != "last" ? (
-                <DateTimePicker
-                  label="Value"
-                  value={dayjs(tempFilter.value)}
-                  onChange={(e) => onChange("value", e?.toISOString() || "")}
-                  views={["year", "day", "hours", "minutes", "seconds"]}
-                />
-              ) : selectedColumn?.type == "DateTime" &&
-                tempFilter.operator == "last" ? (
-                <>
-                  <InputLabel id="value">Value</InputLabel>
-                  <Select
-                    label="Value"
-                    labelId="value"
-                    value={tempFilter.value}
-                    onChange={(e) => onChange("value", e.target.value)}
-                    sx={{ minWidth: 100 }}
-                  >
-                    <MenuItem value="hour">Hour</MenuItem>
-                    <MenuItem value="week">Week</MenuItem>
-                    <MenuItem value="month">Month</MenuItem>
-                    <MenuItem value="year">Year</MenuItem>
-                  </Select>
-                </>
-              ) : selectedColumn?.type == "number" &&
-                !["in", "not in", "like"].includes(tempFilter.operator) ? (
-                <TextField
-                  id="value"
-                  variant="outlined"
-                  label="Value"
-                  value={tempFilter.value}
-                  onChange={(e) => onChange("value", e.target.value)}
-                  type="number"
-                />
-              ) : selectedColumn?.type == "number" &&
-                ["in", "not in"].includes(tempFilter.operator) ? (
-                <TextField
-                  id="value"
-                  variant="outlined"
-                  label="Value"
-                  value={tempFilter.values?.join(" ")}
-                  onChange={(e) =>
-                    onChange("values", e.target.value.split(" "))
-                  }
-                />
-              ) : (
-                <TextField
-                  id="value"
-                  variant="outlined"
-                  label="Value"
-                  value={tempFilter.value}
-                  onChange={(e) => onChange("value", e.target.value)}
-                />
-              )}
-            </FormControl>
-          </LocalizationProvider>
+          {valueSelector()}
 
           <Tooltip title="Finish editing filter">
             <IconButton onClick={() => applyChanges()} color="success">