diff --git a/docker/monitoring/grafana/provisioning/dashboards/cms_deid_medcat.json b/docker/monitoring/grafana/provisioning/dashboards/cms_deid_medcat.json
index 4eea61c..0f5673b 100644
--- a/docker/monitoring/grafana/provisioning/dashboards/cms_deid_medcat.json
+++ b/docker/monitoring/grafana/provisioning/dashboards/cms_deid_medcat.json
@@ -1395,7 +1395,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -1574,7 +1574,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -1753,7 +1753,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -1932,7 +1932,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/redact\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -2135,7 +2135,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -2338,7 +2338,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-deid\", instance=\"medcat-deid:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
diff --git a/docker/monitoring/grafana/provisioning/dashboards/cms_huggingface_ner.json b/docker/monitoring/grafana/provisioning/dashboards/cms_huggingface_ner.json
index ce1255b..ea6ff3b 100644
--- a/docker/monitoring/grafana/provisioning/dashboards/cms_huggingface_ner.json
+++ b/docker/monitoring/grafana/provisioning/dashboards/cms_huggingface_ner.json
@@ -1395,7 +1395,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -1574,7 +1574,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -1753,7 +1753,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -1932,7 +1932,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/redact\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -2135,7 +2135,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -2338,7 +2338,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_huggingface-ner\", instance=\"huggingface-ner:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
diff --git a/docker/monitoring/grafana/provisioning/dashboards/cms_icd10_medcat.json b/docker/monitoring/grafana/provisioning/dashboards/cms_icd10_medcat.json
index 7c4fbbe..ca0d219 100644
--- a/docker/monitoring/grafana/provisioning/dashboards/cms_icd10_medcat.json
+++ b/docker/monitoring/grafana/provisioning/dashboards/cms_icd10_medcat.json
@@ -1698,7 +1698,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -1877,7 +1877,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -2080,7 +2080,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -2283,7 +2283,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-icd10\", instance=\"medcat-icd10:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
diff --git a/docker/monitoring/grafana/provisioning/dashboards/cms_opcs4_medcat.json b/docker/monitoring/grafana/provisioning/dashboards/cms_opcs4_medcat.json
index d35c2e7..0d75bfd 100644
--- a/docker/monitoring/grafana/provisioning/dashboards/cms_opcs4_medcat.json
+++ b/docker/monitoring/grafana/provisioning/dashboards/cms_opcs4_medcat.json
@@ -1698,7 +1698,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -1877,7 +1877,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -2080,7 +2080,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -2283,7 +2283,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-opcs4\", instance=\"medcat-opcs4:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
diff --git a/docker/monitoring/grafana/provisioning/dashboards/cms_snomed_medcat.json b/docker/monitoring/grafana/provisioning/dashboards/cms_snomed_medcat.json
index d4e51be..17ef76f 100644
--- a/docker/monitoring/grafana/provisioning/dashboards/cms_snomed_medcat.json
+++ b/docker/monitoring/grafana/provisioning/dashboards/cms_snomed_medcat.json
@@ -1698,7 +1698,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -1877,7 +1877,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -2080,7 +2080,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
@@ -2283,7 +2283,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(cms_doc_annotations_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
+          "expr": "(rate(cms_doc_annotations_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(cms_doc_annotations_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-snomed\", instance=\"medcat-snomed:8000\", handler=\"/process_bulk\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,
diff --git a/docker/monitoring/grafana/provisioning/dashboards/cms_umls_medcat.json b/docker/monitoring/grafana/provisioning/dashboards/cms_umls_medcat.json
index 71a6476..f67b93b 100644
--- a/docker/monitoring/grafana/provisioning/dashboards/cms_umls_medcat.json
+++ b/docker/monitoring/grafana/provisioning/dashboards/cms_umls_medcat.json
@@ -1698,7 +1698,7 @@
             "uid": "P7A53D3B2E146C92D"
           },
           "editorMode": "code",
-          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-umls\", instance=\"medcat-umls:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_size_bytes_count{job=\"cms_medcat-umls\", instance=\"medcat-umls:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-umls\", instance=\"medcat-umls:8000\", handler=\"/process\"}[$__rate_interval]) / rate(http_request_duration_seconds_count{job=\"cms_medcat-umls\", instance=\"medcat-umls:8000\", handler=\"/process\"}[$__rate_interval]))",
+          "expr": "(rate(http_request_size_bytes_sum{job=\"cms_medcat-umls\", instance=\"medcat-umls:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_size_bytes_count{job=\"cms_medcat-umls\", instance=\"medcat-umls:8000\", handler=\"/process\"}[$__rate_interval])) / (rate(http_request_duration_seconds_sum{job=\"cms_medcat-umls\", instance=\"medcat-umls:8000\", handler=\"/process\"}[$__rate_interval]) / on(job, instance, handler) rate(http_request_duration_seconds_count{job=\"cms_medcat-umls\", instance=\"medcat-umls:8000\", handler=\"/process\"}[$__rate_interval]))",
           "hide": false,
           "legendFormat": "ratio",
           "range": true,