diff --git a/backend/.sqlx/query-0088b5bf5cf1c7e47f18c3d05cce09f3462c8e39cb3291f0d497742ad4763fa3.json b/backend/.sqlx/query-0088b5bf5cf1c7e47f18c3d05cce09f3462c8e39cb3291f0d497742ad4763fa3.json
deleted file mode 100644
index 5fa8d88b2e..0000000000
--- a/backend/.sqlx/query-0088b5bf5cf1c7e47f18c3d05cce09f3462c8e39cb3291f0d497742ad4763fa3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE v2_job_status SET flow_status = \n            CASE WHEN flow_status->'modules'->$1::TEXT->'flow_jobs_duration' IS NOT NULL THEN\n                     JSONB_SET(JSONB_SET(JSONB_SET(\n                         flow_status,\n                         ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT],\n                         $4\n                     ),\n                     ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'duration_ms', $3::TEXT], $5),\n                     ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'started_at', $3::TEXT], $6)\n                 ELSE\n                    JSONB_SET(flow_status, ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4)\n            END\n            WHERE id = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Uuid",
-        "Text",
-        "Jsonb",
-        "Jsonb",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "0088b5bf5cf1c7e47f18c3d05cce09f3462c8e39cb3291f0d497742ad4763fa3"
-}
diff --git a/backend/.sqlx/query-081f838b3dbe81631d17e7ca0751db725a7f92d4e43a86bcfa06a4ac7c70ac8f.json b/backend/.sqlx/query-081f838b3dbe81631d17e7ca0751db725a7f92d4e43a86bcfa06a4ac7c70ac8f.json
new file mode 100644
index 0000000000..75f021b168
--- /dev/null
+++ b/backend/.sqlx/query-081f838b3dbe81631d17e7ca0751db725a7f92d4e43a86bcfa06a4ac7c70ac8f.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE v2_job_status SET flow_status = \n            CASE WHEN flow_status->'modules'->$1::int->'flow_jobs_duration' IS NOT NULL THEN\n                     JSONB_SET(JSONB_SET(JSONB_SET(\n                         flow_status,\n                         ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT],\n                         $4\n                     ),\n                     ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'duration_ms', $3::TEXT], $5),\n                     ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'started_at', $3::TEXT], $6)\n                 ELSE\n                    JSONB_SET(flow_status, ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4)\n            END\n            WHERE id = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Uuid",
+        "Text",
+        "Jsonb",
+        "Jsonb",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "081f838b3dbe81631d17e7ca0751db725a7f92d4e43a86bcfa06a4ac7c70ac8f"
+}
diff --git a/backend/.sqlx/query-2d0df658c31d45592dca7add8c69d06da7d81e7177a324e3f3f9af1076b3ab66.json b/backend/.sqlx/query-2d0df658c31d45592dca7add8c69d06da7d81e7177a324e3f3f9af1076b3ab66.json
deleted file mode 100644
index 9deb40619a..0000000000
--- a/backend/.sqlx/query-2d0df658c31d45592dca7add8c69d06da7d81e7177a324e3f3f9af1076b3ab66.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE v2_job_status SET flow_status = \n                                 CASE \n                                 WHEN flow_status->'modules'->$1::TEXT->'flow_jobs_duration' IS NOT NULL THEN\n                                    JSONB_SET(\n                                         JSONB_SET(JSONB_SET(JSONB_SET(\n                                            flow_status, \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4), \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'started_at', $3::TEXT], $5), \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'duration_ms', $3::TEXT], $6),\n                                            ARRAY['modules', $1::TEXT, 'iterator', 'index'], ((flow_status->'modules'->$1::int->'iterator'->>'index')::int + 1)::text::jsonb\n                                     )\n                                 ELSE\n                                    JSONB_SET(JSONB_SET(flow_status, ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4),\n                                         ARRAY['modules', $1::TEXT, 'iterator', 'index'],\n                                         ((flow_status->'modules'->$1::int->'iterator'->>'index')::int + 1)::text::jsonb\n                                     )                                 END\n                                 WHERE id = $2\n                                 RETURNING (flow_status->'modules'->$1::int->'iterator'->>'index')::int",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "int4",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Uuid",
-        "Text",
-        "Jsonb",
-        "Jsonb",
-        "Jsonb"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "2d0df658c31d45592dca7add8c69d06da7d81e7177a324e3f3f9af1076b3ab66"
-}
diff --git a/backend/.sqlx/query-93f00e2d164c090a959da12cbb7e4fc6e5804fea077116d339a041c0f2b0c1fa.json b/backend/.sqlx/query-93f00e2d164c090a959da12cbb7e4fc6e5804fea077116d339a041c0f2b0c1fa.json
new file mode 100644
index 0000000000..7600acb32a
--- /dev/null
+++ b/backend/.sqlx/query-93f00e2d164c090a959da12cbb7e4fc6e5804fea077116d339a041c0f2b0c1fa.json
@@ -0,0 +1,27 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE v2_job_status SET flow_status = \n                                 CASE \n                                 WHEN flow_status->'modules'->$1::int->'flow_jobs_duration' IS NOT NULL THEN\n                                    JSONB_SET(\n                                         JSONB_SET(JSONB_SET(JSONB_SET(\n                                            flow_status, \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4), \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'started_at', $3::TEXT], $5), \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'duration_ms', $3::TEXT], $6),\n                                            ARRAY['modules', $1::TEXT, 'branchall', 'branch'],\n                                            ((flow_status->'modules'->$1::int->'branchall'->>'branch')::int + 1)::text::jsonb\n                                     )\n                                 ELSE\n                                    JSONB_SET(JSONB_SET(\n                                    flow_status, ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4),\n                                         ARRAY['modules', $1::TEXT, 'branchall', 'branch'],\n                                         ((flow_status->'modules'->$1::int->'branchall'->>'branch')::int + 1)::text::jsonb\n                                     )\n                                 END\n                                 WHERE id = $2\n                                 RETURNING (flow_status->'modules'->$1::int->'branchall'->>'branch')::int",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "int4",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Uuid",
+        "Text",
+        "Jsonb",
+        "Jsonb",
+        "Jsonb"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "93f00e2d164c090a959da12cbb7e4fc6e5804fea077116d339a041c0f2b0c1fa"
+}
diff --git a/backend/.sqlx/query-a49e59c814d440bfed7d6bfc2755518225b1243a9d39ce659b95637c33d0954f.json b/backend/.sqlx/query-a49e59c814d440bfed7d6bfc2755518225b1243a9d39ce659b95637c33d0954f.json
deleted file mode 100644
index 1315df082f..0000000000
--- a/backend/.sqlx/query-a49e59c814d440bfed7d6bfc2755518225b1243a9d39ce659b95637c33d0954f.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE v2_job_status SET flow_status = \n                                 CASE \n                                 WHEN flow_status->'modules'->$1::TEXT->'flow_jobs_duration' IS NOT NULL THEN\n                                    JSONB_SET(\n                                         JSONB_SET(JSONB_SET(JSONB_SET(\n                                            flow_status, \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4), \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'started_at', $3::TEXT], $5), \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'duration_ms', $3::TEXT], $6),\n                                            ARRAY['modules', $1::TEXT, 'branchall', 'branch'],\n                                            ((flow_status->'modules'->$1::int->'branchall'->>'branch')::int + 1)::text::jsonb\n                                     )\n                                 ELSE\n                                    JSONB_SET(JSONB_SET(\n                                    flow_status, ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4),\n                                         ARRAY['modules', $1::TEXT, 'branchall', 'branch'],\n                                         ((flow_status->'modules'->$1::int->'branchall'->>'branch')::int + 1)::text::jsonb\n                                     )\n                                 END\n                                 WHERE id = $2\n                                 RETURNING (flow_status->'modules'->$1::int->'branchall'->>'branch')::int",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "int4",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Uuid",
-        "Text",
-        "Jsonb",
-        "Jsonb",
-        "Jsonb"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "a49e59c814d440bfed7d6bfc2755518225b1243a9d39ce659b95637c33d0954f"
-}
diff --git a/backend/.sqlx/query-dff20d00a73d7afdda2b3e9867994fafda587749ddd4d53bea5ef36151da5225.json b/backend/.sqlx/query-dff20d00a73d7afdda2b3e9867994fafda587749ddd4d53bea5ef36151da5225.json
new file mode 100644
index 0000000000..2189a90286
--- /dev/null
+++ b/backend/.sqlx/query-dff20d00a73d7afdda2b3e9867994fafda587749ddd4d53bea5ef36151da5225.json
@@ -0,0 +1,27 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE v2_job_status SET flow_status = \n                                 CASE \n                                 WHEN flow_status->'modules'->$1::int->'flow_jobs_duration' IS NOT NULL THEN\n                                    JSONB_SET(\n                                         JSONB_SET(JSONB_SET(JSONB_SET(\n                                            flow_status, \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4), \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'started_at', $3::TEXT], $5), \n                                            ARRAY['modules', $1::TEXT, 'flow_jobs_duration', 'duration_ms', $3::TEXT], $6),\n                                            ARRAY['modules', $1::TEXT, 'iterator', 'index'], ((flow_status->'modules'->$1::int->'iterator'->>'index')::int + 1)::text::jsonb\n                                     )\n                                 ELSE\n                                    JSONB_SET(JSONB_SET(flow_status, ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4),\n                                         ARRAY['modules', $1::TEXT, 'iterator', 'index'],\n                                         ((flow_status->'modules'->$1::int->'iterator'->>'index')::int + 1)::text::jsonb\n                                     )                                 \n                                END\n                                 WHERE id = $2\n                                 RETURNING (flow_status->'modules'->$1::int->'iterator'->>'index')::int",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "int4",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Uuid",
+        "Text",
+        "Jsonb",
+        "Jsonb",
+        "Jsonb"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "dff20d00a73d7afdda2b3e9867994fafda587749ddd4d53bea5ef36151da5225"
+}
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 832af368d1..c5905ef550 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -536,7 +536,7 @@ pub async fn update_flow_status_after_job_completion_internal(
                              sqlx::query_scalar!(
                                  "UPDATE v2_job_status SET flow_status = 
                                  CASE 
-                                 WHEN flow_status->'modules'->$1::TEXT->'flow_jobs_duration' IS NOT NULL THEN
+                                 WHEN flow_status->'modules'->$1::int->'flow_jobs_duration' IS NOT NULL THEN
                                     JSONB_SET(
                                          JSONB_SET(JSONB_SET(JSONB_SET(
                                             flow_status, 
@@ -549,7 +549,8 @@ pub async fn update_flow_status_after_job_completion_internal(
                                     JSONB_SET(JSONB_SET(flow_status, ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT], $4),
                                          ARRAY['modules', $1::TEXT, 'iterator', 'index'],
                                          ((flow_status->'modules'->$1::int->'iterator'->>'index')::int + 1)::text::jsonb
-                                     )                                 END
+                                     )                                 
+                                END
                                  WHERE id = $2
                                  RETURNING (flow_status->'modules'->$1::int->'iterator'->>'index')::int",
                                  old_status.step,
@@ -611,7 +612,7 @@ pub async fn update_flow_status_after_job_completion_internal(
                              sqlx::query_scalar!(
                                  "UPDATE v2_job_status SET flow_status = 
                                  CASE 
-                                 WHEN flow_status->'modules'->$1::TEXT->'flow_jobs_duration' IS NOT NULL THEN
+                                 WHEN flow_status->'modules'->$1::int->'flow_jobs_duration' IS NOT NULL THEN
                                     JSONB_SET(
                                          JSONB_SET(JSONB_SET(JSONB_SET(
                                             flow_status, 
@@ -1599,7 +1600,7 @@ async fn set_success_and_duration_in_flow_job_success<'c>(
         if let Some(position) = position {
             sqlx::query!(
                 "UPDATE v2_job_status SET flow_status = 
-            CASE WHEN flow_status->'modules'->$1::TEXT->'flow_jobs_duration' IS NOT NULL THEN
+            CASE WHEN flow_status->'modules'->$1::int->'flow_jobs_duration' IS NOT NULL THEN
                      JSONB_SET(JSONB_SET(JSONB_SET(
                          flow_status,
                          ARRAY['modules', $1::TEXT, 'flow_jobs_success', $3::TEXT],