From 4aaba95148318749046f779d707967ecf71d06c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Pardou?=
 <571533+jrmi@users.noreply.github.com>
Date: Mon, 10 Nov 2025 15:14:28 +0100
Subject: [PATCH 1/6] Fix star in data path (#4180)

* Fix star in data path that were broken
---
 .../data_providers/data_provider_types.py     | 20 ++++--
 .../data_providers/data_provider_types.py     | 22 ++++--
 .../local_baserow/service_types.py            | 25 ++-----
 .../src/baserow/core/services/registries.py   | 10 +--
 .../test_data_provider_types.py               | 67 +++++++++++++++++++
 .../modules/builder/dataProviderTypes.js      | 51 +++++++++-----
 web-frontend/modules/builder/elementTypes.js  | 29 +++++---
 .../modules/builder/workflowActionTypes.js    |  8 +--
 web-frontend/modules/core/serviceTypes.js     |  5 +-
 .../modules/core/workflowActionTypes.js       |  5 +-
 .../integrations/localBaserow/serviceTypes.js | 12 ++--
 11 files changed, 171 insertions(+), 83 deletions(-)

diff --git a/backend/src/baserow/contrib/automation/data_providers/data_provider_types.py b/backend/src/baserow/contrib/automation/data_providers/data_provider_types.py
index 15de4d6f46..2793e78715 100644
--- a/backend/src/baserow/contrib/automation/data_providers/data_provider_types.py
+++ b/backend/src/baserow/contrib/automation/data_providers/data_provider_types.py
@@ -37,17 +37,27 @@ def get_data_chunk(
             previous_node_results = dispatch_context.previous_nodes_results[
                 int(previous_node.id)
             ]
-            if previous_node.service.get_type().returns_list:
-                previous_node_results = previous_node_results["results"]
         except KeyError as exc:
             message = (
                 "The previous node id is not present in the dispatch context results"
             )
             raise InvalidFormulaContext(message) from exc
+
+        service = previous_node.service.specific
+
+        if service.get_type().returns_list:
+            previous_node_results = previous_node_results["results"]
+            if len(rest) >= 2:
+                prepared_path = [
+                    rest[0],
+                    *service.get_type().prepare_value_path(service, rest[1:]),
+                ]
+            else:
+                prepared_path = rest
         else:
-            return previous_node.service.get_type().get_value_at_path(
-                previous_node.service.specific, previous_node_results, rest
-            )
+            prepared_path = service.get_type().prepare_value_path(service, rest)
+
+        return get_value_at_path(previous_node_results, prepared_path)
 
     def import_path(self, path, id_mapping, **kwargs):
         """
diff --git a/backend/src/baserow/contrib/builder/data_providers/data_provider_types.py b/backend/src/baserow/contrib/builder/data_providers/data_provider_types.py
index 25722ac04f..c79f419005 100644
--- a/backend/src/baserow/contrib/builder/data_providers/data_provider_types.py
+++ b/backend/src/baserow/contrib/builder/data_providers/data_provider_types.py
@@ -177,12 +177,21 @@ def get_data_chunk(self, dispatch_context: BuilderDispatchContext, path: List[st
             data_source, dispatch_context
         )
 
-        if data_source.service.get_type().returns_list:
+        service = data_source.service.specific
+
+        if service.get_type().returns_list:
             dispatch_result = dispatch_result["results"]
+            if len(rest) >= 2:
+                prepared_path = [
+                    rest[0],
+                    *service.get_type().prepare_value_path(service, rest[1:]),
+                ]
+            else:
+                prepared_path = rest
+        else:
+            prepared_path = service.get_type().prepare_value_path(service, rest)
 
-        return data_source.service.get_type().get_value_at_path(
-            data_source.service.specific, dispatch_result, rest
-        )
+        return get_value_at_path(dispatch_result, prepared_path)
 
     def import_path(self, path, id_mapping, **kwargs):
         """
@@ -484,9 +493,10 @@ def get_data_chunk(self, dispatch_context: DispatchContext, path: List[str]):
             cache_key = self.get_dispatch_action_cache_key(
                 dispatch_id, workflow_action.id
             )
-            return workflow_action.service.get_type().get_value_at_path(
-                workflow_action.service.specific, cache.get(cache_key), rest
+            prepared_path = workflow_action.service.get_type().prepare_value_path(
+                workflow_action.service.specific, rest
             )
+            return get_value_at_path(cache.get(cache_key), prepared_path)
         else:
             # Frontend actions
             return get_value_at_path(previous_action_results[previous_action_id], rest)
diff --git a/backend/src/baserow/contrib/integrations/local_baserow/service_types.py b/backend/src/baserow/contrib/integrations/local_baserow/service_types.py
index 74c58fbb05..5739760cc3 100644
--- a/backend/src/baserow/contrib/integrations/local_baserow/service_types.py
+++ b/backend/src/baserow/contrib/integrations/local_baserow/service_types.py
@@ -225,21 +225,11 @@ def sanitize_result(self, service, result, allowed_field_names):
 
         return super().sanitize_result(service, result, allowed_field_names)
 
-    def get_value_at_path(self, service: Service, context: Any, path: List[str]):
-        """
-        Convert the field name to a human name.
-        """
-
-        if self.returns_list:
-            if len(path) < 2:
-                return super().get_value_at_path(service, context, path)
-
-            row_index, db_column, *rest = path
-        else:
-            if len(path) < 1:
-                return super().get_value_at_path(service, context, path)
+    def prepare_value_path(self, service: Service, path: List[str]):
+        if len(path) < 1:
+            return path
 
-            db_column, *rest = path
+        db_column, *rest = path
 
         human_name = db_column
 
@@ -248,12 +238,7 @@ def get_value_at_path(self, service: Service, context: Any, path: List[str]):
                 human_name = field_obj["field"].name
                 break
 
-        if self.returns_list:
-            return super().get_value_at_path(
-                service, context, [row_index, human_name, *rest]
-            )
-        else:
-            return super().get_value_at_path(service, context, [human_name, *rest])
+        return [human_name, *rest]
 
     def build_queryset(
         self,
diff --git a/backend/src/baserow/core/services/registries.py b/backend/src/baserow/core/services/registries.py
index d5605a1e9c..abb84cdace 100644
--- a/backend/src/baserow/core/services/registries.py
+++ b/backend/src/baserow/core/services/registries.py
@@ -33,7 +33,6 @@
 )
 from baserow.core.services.dispatch_context import DispatchContext
 from baserow.core.services.types import DispatchResult, FormulaToResolve
-from baserow.core.utils import get_value_at_path
 
 from .exceptions import (
     DispatchException,
@@ -312,13 +311,8 @@ def resolve_service_formulas(
 
         return resolved_values
 
-    def get_value_at_path(self, service: Service, context: Any, path: List[str]):
-        """
-        Offers the opportunity to hook into way data are extracted from the context for
-        a given path.
-        """
-
-        return get_value_at_path(context, path)
+    def prepare_value_path(self, service: Service, path: List[str]):
+        return path
 
     def dispatch_transform(
         self,
diff --git a/backend/tests/baserow/contrib/builder/data_providers/test_data_provider_types.py b/backend/tests/baserow/contrib/builder/data_providers/test_data_provider_types.py
index 20df48281f..49827c23ad 100644
--- a/backend/tests/baserow/contrib/builder/data_providers/test_data_provider_types.py
+++ b/backend/tests/baserow/contrib/builder/data_providers/test_data_provider_types.py
@@ -197,6 +197,73 @@ def test_data_source_data_provider_get_data_chunk(data_fixture):
     )
 
 
+@pytest.mark.django_db
+def test_data_source_data_provider_get_data_chunk_with_list_data_source(data_fixture):
+    user = data_fixture.create_user()
+    table, fields, rows = data_fixture.build_table(
+        user=user,
+        columns=[
+            ("Name", "text"),
+            ("My Color", "text"),
+        ],
+        rows=[
+            ["BMW", "Blue"],
+            ["Audi", "Orange"],
+            ["Volkswagen", "White"],
+            ["Volkswagen", "Green"],
+        ],
+    )
+    builder = data_fixture.create_builder_application(user=user)
+    integration = data_fixture.create_local_baserow_integration(
+        user=user, application=builder
+    )
+    page = data_fixture.create_builder_page(user=user, builder=builder)
+    data_source = data_fixture.create_builder_local_baserow_list_rows_data_source(
+        user=user,
+        page=page,
+        integration=integration,
+        table=table,
+        name="Items",
+    )
+
+    data_source_provider = DataSourceDataProviderType()
+
+    dispatch_context = BuilderDispatchContext(
+        HttpRequest(), page, only_expose_public_allowed_properties=False
+    )
+
+    assert (
+        data_source_provider.get_data_chunk(
+            dispatch_context, [data_source.id, "0", fields[1].db_column]
+        )
+        == "Blue"
+    )
+
+    dispatch_context.reset_call_stack()
+
+    assert (
+        data_source_provider.get_data_chunk(
+            dispatch_context, [data_source.id, "2", fields[1].db_column]
+        )
+        == "White"
+    )
+
+    dispatch_context.reset_call_stack()
+
+    assert (
+        data_source_provider.get_data_chunk(
+            dispatch_context, [data_source.id, "0", "id"]
+        )
+        == rows[0].id
+    )
+
+    dispatch_context.reset_call_stack()
+
+    assert data_source_provider.get_data_chunk(
+        dispatch_context, [data_source.id, "*", fields[1].db_column]
+    ) == ["Blue", "Orange", "White", "Green"]
+
+
 @pytest.mark.django_db
 def test_data_source_data_provider_get_data_chunk_with_formula(data_fixture):
     user = data_fixture.create_user()
diff --git a/web-frontend/modules/builder/dataProviderTypes.js b/web-frontend/modules/builder/dataProviderTypes.js
index f4f9b3a927..13341f973a 100644
--- a/web-frontend/modules/builder/dataProviderTypes.js
+++ b/web-frontend/modules/builder/dataProviderTypes.js
@@ -120,23 +120,32 @@ export class DataSourceDataProviderType extends DataProviderType {
       'dataSource/getPagesDataSourceById'
     ](pages, parseInt(dataSourceId))
 
-    const rawContent = this.getDataSourceContent(applicationContext, dataSource)
+    const content = this.getDataSourceContent(applicationContext, dataSource)
 
-    const serviceType = this.app.$registry.get('service', dataSource.type)
+    let preparedPath
+
+    if (!content) {
+      return null
+    }
 
-    let content = rawContent
-    let path = rest
+    const serviceType = this.app.$registry.get('service', dataSource.type)
 
     if (serviceType.returnsList) {
       // if it returns a list let's consume the next path token which is the row
-      const [row, ...afterRow] = rest
-      content = getValueAtPath(content, row)
-      path = afterRow
+      if (rest.length >= 2) {
+        const [row, ...afterRow] = rest
+        preparedPath = [
+          row,
+          ...serviceType.prepareValuePath(dataSource, afterRow),
+        ]
+      } else {
+        preparedPath = rest
+      }
+    } else {
+      preparedPath = serviceType.prepareValuePath(dataSource, rest)
     }
 
-    return content
-      ? serviceType.getValueAtPath(dataSource, content, path)
-      : null
+    return getValueAtPath(content, preparedPath)
   }
 
   getDataSourceContent(applicationContext, dataSource) {
@@ -451,10 +460,15 @@ export class CurrentRecordDataProviderType extends DataProviderType {
   }
 
   getDataChunk(applicationContext, path) {
-    const { element } = applicationContext
+    const { element, recordIndexPath = [0] } = applicationContext
 
     const elementType = this.app.$registry.get('element', element.type)
 
+    // Special case for the index
+    if (path.length === 1 && path[0] === this.indexKey) {
+      return recordIndexPath.at(-1)
+    }
+
     return elementType.getElementCurrentContent(applicationContext, path)
   }
 
@@ -831,13 +845,14 @@ export class PreviousActionDataProviderType extends DataProviderType {
       workflowAction.type
     )
 
-    return content[workflowActionId]
-      ? actionType.getValueAtPath(
-          workflowAction,
-          content[workflowActionId],
-          rest
-        )
-      : null
+    if (!content[workflowActionId]) {
+      return null
+    }
+
+    return getValueAtPath(
+      content[workflowActionId],
+      actionType.prepareValuePath(workflowAction, rest)
+    )
   }
 
   getWorkflowActionSchema(workflowAction) {
diff --git a/web-frontend/modules/builder/elementTypes.js b/web-frontend/modules/builder/elementTypes.js
index 956ccc965e..dabc7121f8 100644
--- a/web-frontend/modules/builder/elementTypes.js
+++ b/web-frontend/modules/builder/elementTypes.js
@@ -94,6 +94,7 @@ import elementImageTable from '@baserow/modules/builder/assets/icons/element-tab
 import elementImageText from '@baserow/modules/builder/assets/icons/element-text.svg'
 
 import _ from 'lodash'
+import { getValueAtPath } from '../core/utils/object'
 
 export class ElementType extends Registerable {
   get name() {
@@ -840,6 +841,7 @@ export class ElementType extends Registerable {
       mainDataSource.type
     )
 
+    // Create a path joining the record indexes and the schemaProperties
     const dataPaths = collectionAncestry
       .map(({ schema_property: schemaProperty }) => schemaProperty || null)
       .flatMap((x, i) =>
@@ -852,20 +854,27 @@ export class ElementType extends Registerable {
     const contentRows = mainElementType.getElementContentInStore(mainElement)
 
     if (fullDataPath.length) {
+      let preparedPath
       if (mainDataSourceType.returnsList) {
-        // directly consume the first path item as it's the row index
-        // and the getValueAtPath is only able to support property level.
-        return mainDataSourceType.getValueAtPath(
+        if (fullDataPath.length >= 2) {
+          // not include the first path item as it's the row index
+          // and the prepareValuePath is only able to support property level.
+          const [row, ...rest] = fullDataPath
+          preparedPath = [
+            row,
+            ...mainDataSourceType.prepareValuePath(mainDataSource, rest),
+          ]
+        } else {
+          preparedPath = fullDataPath
+        }
+      } else {
+        preparedPath = mainDataSourceType.prepareValuePath(
           mainDataSource,
-          contentRows[fullDataPath[0]],
-          fullDataPath.slice(1)
+          fullDataPath
         )
       }
-      return mainDataSourceType.getValueAtPath(
-        mainDataSource,
-        contentRows,
-        fullDataPath
-      )
+
+      return getValueAtPath(contentRows, preparedPath)
     }
 
     return contentRows
diff --git a/web-frontend/modules/builder/workflowActionTypes.js b/web-frontend/modules/builder/workflowActionTypes.js
index 541f2eeea4..dd89b6cd0f 100644
--- a/web-frontend/modules/builder/workflowActionTypes.js
+++ b/web-frontend/modules/builder/workflowActionTypes.js
@@ -306,12 +306,8 @@ export class WorkflowActionServiceType extends WorkflowActionType {
     return super.getErrorMessage(workflowAction, applicationContext)
   }
 
-  getValueAtPath(workflowAction, content, path) {
-    return this.serviceType.getValueAtPath(
-      workflowAction.service,
-      content,
-      path
-    )
+  prepareValuePath(workflowAction, path) {
+    return this.serviceType.prepareValuePath(workflowAction.service, path)
   }
 
   get serviceType() {
diff --git a/web-frontend/modules/core/serviceTypes.js b/web-frontend/modules/core/serviceTypes.js
index 01dcb669fc..588d31120d 100644
--- a/web-frontend/modules/core/serviceTypes.js
+++ b/web-frontend/modules/core/serviceTypes.js
@@ -1,5 +1,4 @@
 import { Registerable } from '@baserow/modules/core/registry'
-import { getValueAtPath } from '@baserow/modules/core/utils/object'
 
 export class ServiceType extends Registerable {
   get name() {
@@ -77,8 +76,8 @@ export class ServiceType extends Registerable {
   /**
    * Allow to customize way data are accessed from service
    */
-  getValueAtPath(service, content, path) {
-    return getValueAtPath(content, path.join('.'))
+  prepareValuePath(service, path) {
+    return path
   }
 
   getOrder() {
diff --git a/web-frontend/modules/core/workflowActionTypes.js b/web-frontend/modules/core/workflowActionTypes.js
index 6a85b73a10..b3ee25228a 100644
--- a/web-frontend/modules/core/workflowActionTypes.js
+++ b/web-frontend/modules/core/workflowActionTypes.js
@@ -1,5 +1,4 @@
 import { Registerable } from '@baserow/modules/core/registry'
-import { getValueAtPath } from '@baserow/modules/core/utils/object'
 
 export class WorkflowActionType extends Registerable {
   get form() {
@@ -35,8 +34,8 @@ export class WorkflowActionType extends Registerable {
   /**
    * Allow to customize way data are accessed from workflow action
    */
-  getValueAtPath(workflowAction, content, path) {
-    return getValueAtPath(content, path.join('.'))
+  prepareValuePath(workflowAction, path) {
+    return path
   }
 
   /**
diff --git a/web-frontend/modules/integrations/localBaserow/serviceTypes.js b/web-frontend/modules/integrations/localBaserow/serviceTypes.js
index cffec47794..703a6217a0 100644
--- a/web-frontend/modules/integrations/localBaserow/serviceTypes.js
+++ b/web-frontend/modules/integrations/localBaserow/serviceTypes.js
@@ -15,7 +15,6 @@ import LocalBaserowSignalTriggerServiceForm from '@baserow/modules/integrations/
 import LocalBaserowGetRowForm from '@baserow/modules/integrations/localBaserow/components/services/LocalBaserowGetRowForm'
 import LocalBaserowListRowsForm from '@baserow/modules/integrations/localBaserow/components/services/LocalBaserowListRowsForm'
 import LocalBaserowAggregateRowsForm from '@baserow/modules/integrations/localBaserow/components/services/LocalBaserowAggregateRowsForm'
-import { getValueAtPath } from '@baserow/modules/core/utils/object'
 
 export class LocalBaserowTableServiceType extends ServiceType {
   get integrationType() {
@@ -80,13 +79,17 @@ export class LocalBaserowTableServiceType extends ServiceType {
     return description
   }
 
-  getValueAtPath(service, content, path) {
+  prepareValuePath(service, path) {
+    if (path.length < 1) {
+      return path
+    }
+
     const schema = this.getDataSchema(service)
 
     const [field, ...rest] = path
     let humanName = field
 
-    if (schema && field.startsWith('field_')) {
+    if (schema && field && field.startsWith('field_')) {
       if (this.returnsList) {
         if (schema.items?.properties?.[field]?.title) {
           humanName = schema.items.properties[field].title
@@ -95,7 +98,8 @@ export class LocalBaserowTableServiceType extends ServiceType {
         humanName = schema.properties[field].title
       }
     }
-    return getValueAtPath(content, [humanName, ...rest].join('.'))
+
+    return [humanName, ...rest]
   }
 }
 

From eda3db2a2d4ecf301db0bd891ce2913dc605f26c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Pardou?=
 <571533+jrmi@users.noreply.github.com>
Date: Mon, 10 Nov 2025 15:57:48 +0100
Subject: [PATCH 2/6] Wab pre 2.0 bug fixes (#4167)

* Support raw formulas in the backend

* Fix import with operator

* Fix new edge addition delay

* Fix the double undo necessary for local baserow node creation

* Show error on simulate dispatch error

* Follow up of AI agent node

* Datasource without table were breaking the application

* Fix filter value mode

* Change ai node name
---
 .../contrib/automation/formula_importer.py    |  21 +-
 .../contrib/automation/nodes/handler.py       |  28 ++-
 .../contrib/automation/nodes/registries.py    |   4 +-
 .../contrib/automation/nodes/service.py       |  13 +
 .../automation/workflows/graph_handler.py     |   6 +
 .../contrib/automation/workflows/handler.py   |  34 +--
 .../builder/api/elements/serializers.py       |   2 +-
 .../elements/collection_field_types.py        |  27 +-
 .../contrib/builder/elements/element_types.py |  21 +-
 .../contrib/builder/elements/registries.py    |   3 +-
 .../contrib/builder/formula_importer.py       |  21 +-
 .../builder/formula_property_extractor.py     |   3 +
 backend/src/baserow/contrib/builder/mixins.py |   3 +-
 .../workflow_actions/workflow_action_types.py |   8 +-
 .../contrib/integrations/ai/service_types.py  |  26 +-
 .../integrations/core/service_types.py        |   7 +-
 .../local_baserow/api/serializers.py          |   8 +-
 .../integrations/local_baserow/mixins.py      |  29 ++-
 .../local_baserow/service_types.py            |   5 +-
 backend/src/baserow/core/formula/__init__.py  |   6 +-
 .../src/baserow/core/formula/serializers.py   |  21 --
 backend/src/baserow/core/registry.py          |   6 +-
 .../baserow/core/services/formula_importer.py |   4 +-
 .../src/baserow/core/services/registries.py   |  53 ++--
 .../automation/nodes/test_node_actions.py     |  10 +-
 .../automation/nodes/test_node_service.py     |   3 +-
 .../workflows/test_graph_handler.py           |   2 +-
 .../data_sources/test_data_source_views.py    |  14 +-
 .../test_data_provider_types.py               |  43 +++-
 .../test_tags_collection_field_type.py        |   7 +-
 .../contrib/builder/test_formula_importer.py  |  19 +-
 .../test_formula_property_extractor.py        |   4 +-
 .../ai/test_ai_agent_service_type.py          |  39 +--
 .../form/SimulateDispatchNodeForm.vue         |  36 ++-
 .../components/sidebar/SampleDataModal.vue    |   2 +-
 .../components/workflow/WorkflowNode.vue      |  46 ++--
 .../modules/automation/locales/en.json        |   4 +-
 .../node/simulate_dispatch_node.scss          |   8 +
 web-frontend/modules/core/formula/index.js    |   4 +-
 web-frontend/modules/core/serviceTypes.js     |   5 +-
 web-frontend/modules/core/utils/object.js     |   9 +-
 .../services/AIAgentServiceForm.vue           | 232 +++++++++---------
 .../integrations/ai/integrationTypes.js       |  11 +-
 .../services/LocalBaserowServiceForm.vue      |   1 -
 ...ocalBaserowTableServiceConditionalForm.vue |  31 ++-
 .../modules/integrations/locales/en.json      |   8 +-
 46 files changed, 501 insertions(+), 396 deletions(-)

diff --git a/backend/src/baserow/contrib/automation/formula_importer.py b/backend/src/baserow/contrib/automation/formula_importer.py
index 4e741df095..7d4fba1f4c 100644
--- a/backend/src/baserow/contrib/automation/formula_importer.py
+++ b/backend/src/baserow/contrib/automation/formula_importer.py
@@ -4,6 +4,7 @@
     automation_data_provider_type_registry,
 )
 from baserow.core.formula import BaserowFormulaObject, get_parse_tree_for_formula
+from baserow.core.formula.types import BASEROW_FORMULA_MODE_RAW
 from baserow.core.services.formula_importer import BaserowFormulaImporter
 
 
@@ -20,7 +21,7 @@ def get_data_provider_type_registry(self):
 
 def import_formula(
     formula: Union[str, BaserowFormulaObject], id_mapping: Dict[str, str], **kwargs
-) -> str:
+) -> BaserowFormulaObject:
     """
     When a formula is used in an automation, it must be migrated when we import it
     because it could contain IDs referencing other objects.
@@ -32,11 +33,17 @@ def import_formula(
     :return: The updated path.
     """
 
-    # Figure out what our formula string is.
-    formula_str = formula if isinstance(formula, str) else formula["formula"]
+    formula = BaserowFormulaObject.to_formula(formula)
 
-    if not formula_str:
-        return formula_str
+    if formula["mode"] == BASEROW_FORMULA_MODE_RAW or not formula["formula"]:
+        return formula
 
-    tree = get_parse_tree_for_formula(formula_str)
-    return AutomationFormulaImporter(id_mapping, **kwargs).visit(tree)
+    tree = get_parse_tree_for_formula(formula["formula"])
+    new_formula = AutomationFormulaImporter(id_mapping, **kwargs).visit(tree)
+
+    if new_formula != formula["formula"]:
+        # We create a new instance to show it's a different formula
+        formula = dict(formula)
+        formula["formula"] = new_formula
+
+    return formula
diff --git a/backend/src/baserow/contrib/automation/nodes/handler.py b/backend/src/baserow/contrib/automation/nodes/handler.py
index fc14aebf00..931b0f4b05 100644
--- a/backend/src/baserow/contrib/automation/nodes/handler.py
+++ b/backend/src/baserow/contrib/automation/nodes/handler.py
@@ -7,6 +7,8 @@
 from baserow.contrib.automation.automation_dispatch_context import (
     AutomationDispatchContext,
 )
+from baserow.contrib.automation.constants import IMPORT_SERIALIZED_IMPORTING
+from baserow.contrib.automation.formula_importer import import_formula
 from baserow.contrib.automation.models import AutomationWorkflow
 from baserow.contrib.automation.nodes.exceptions import (
     AutomationNodeDoesNotExist,
@@ -28,9 +30,7 @@
 from baserow.core.services.handler import ServiceHandler
 from baserow.core.services.models import Service
 from baserow.core.storage import ExportZipFile
-from baserow.core.utils import MirrorDict, extract_allowed
-
-from .signals import automation_node_updated
+from baserow.core.utils import ChildProgressBuilder, MirrorDict, extract_allowed
 
 
 class AutomationNodeHandler:
@@ -275,6 +275,7 @@ def import_nodes(
         serialized_nodes: List[AutomationNodeDict],
         id_mapping: Dict[str, Dict[int, int]],
         cache: Optional[Dict] = None,
+        progress: Optional[ChildProgressBuilder] = None,
         *args,
         **kwargs,
     ):
@@ -303,9 +304,22 @@ def import_nodes(
                 *args,
                 **kwargs,
             )
-            imported_nodes.append([node_instance, serialized_node])
+            imported_nodes.append(node_instance)
+
+            if progress:
+                progress.increment(state=IMPORT_SERIALIZED_IMPORTING)
+
+        # We migrate service formulas here to make sure all nodes are imported before
+        # we migrate them
+        for imported_node in imported_nodes:
+            service = imported_node.service.specific
+            updated_models = service.get_type().import_formulas(
+                service, id_mapping, import_formula, **kwargs
+            )
+
+            [u.save() for u in updated_models]
 
-        return [i[0] for i in imported_nodes]
+        return imported_nodes
 
     def import_node_only(
         self,
@@ -362,10 +376,6 @@ def dispatch_node(
             # Return early if this is a simulated dispatch
             if until_node := dispatch_context.simulate_until_node:
                 if until_node.id == node.id:
-                    # sample_data was updated as it's a simulation we should tell to
-                    # the frontend
-                    node.service.refresh_from_db(fields=["sample_data"])
-                    automation_node_updated.send(self, user=None, node=node)
                     return
 
             if children := node.get_children():
diff --git a/backend/src/baserow/contrib/automation/nodes/registries.py b/backend/src/baserow/contrib/automation/nodes/registries.py
index 8b72abd995..0c741a3950 100644
--- a/backend/src/baserow/contrib/automation/nodes/registries.py
+++ b/backend/src/baserow/contrib/automation/nodes/registries.py
@@ -5,7 +5,6 @@
 from baserow.contrib.automation.automation_dispatch_context import (
     AutomationDispatchContext,
 )
-from baserow.contrib.automation.formula_importer import import_formula
 from baserow.contrib.automation.nodes.exceptions import AutomationNodeNotReplaceable
 from baserow.contrib.automation.nodes.models import AutomationNode
 from baserow.contrib.automation.nodes.types import AutomationNodeDict, NodePositionType
@@ -204,7 +203,7 @@ def deserialize_property(
                 storage=storage,
                 cache=cache,
                 files_zip=files_zip,
-                import_formula=import_formula,
+                # We don't migrate formulas here but later after the node import
                 import_export_config=kwargs.get("import_export_config"),
             )
         return super().deserialize_property(
@@ -259,6 +258,7 @@ def prepare_values(
             # as part of creating a new node. If this happens, we need
             # to create a new service.
             service = ServiceHandler().create_service(service_type)
+
         else:
             service = instance.service.specific
 
diff --git a/backend/src/baserow/contrib/automation/nodes/service.py b/backend/src/baserow/contrib/automation/nodes/service.py
index f870e608f3..de863c83f2 100644
--- a/backend/src/baserow/contrib/automation/nodes/service.py
+++ b/backend/src/baserow/contrib/automation/nodes/service.py
@@ -36,6 +36,7 @@
 )
 from baserow.contrib.automation.workflows.signals import automation_workflow_updated
 from baserow.core.handler import CoreHandler
+from baserow.core.integrations.handler import IntegrationHandler
 from baserow.core.trash.handler import TrashHandler
 
 
@@ -173,6 +174,18 @@ def create_node(
 
         prepared_values = node_type.prepare_values(kwargs, user)
 
+        # Preselect first integration if exactly one exists
+        if node_type.get_service_type().integration_type:
+            integrations_of_type = [
+                i
+                for i in IntegrationHandler().get_integrations(workflow.automation)
+                if i.get_type().type == node_type.get_service_type().integration_type
+            ]
+
+            if len(integrations_of_type) == 1:
+                prepared_values["service"].integration = integrations_of_type[0]
+                prepared_values["service"].save()
+
         new_node = self.handler.create_node(
             node_type,
             workflow=workflow,
diff --git a/backend/src/baserow/contrib/automation/workflows/graph_handler.py b/backend/src/baserow/contrib/automation/workflows/graph_handler.py
index b1af973f50..2c15de8152 100644
--- a/backend/src/baserow/contrib/automation/workflows/graph_handler.py
+++ b/backend/src/baserow/contrib/automation/workflows/graph_handler.py
@@ -340,6 +340,10 @@ def remove(self, node_to_delete: AutomationNode, keep_info=False):
                 node_to_delete.id,
                 next_node_ids,
             )
+            if not graph[node_position_id]["next"][output]:
+                del graph[node_position_id]["next"][output]
+            if not graph[node_position_id]["next"]:
+                del graph[node_position_id]["next"]
         elif position == "child":
             next_nodes = self._get_all_next_nodes(node_to_delete)
             graph[node_position_id]["children"] = _replace(
@@ -347,6 +351,8 @@ def remove(self, node_to_delete: AutomationNode, keep_info=False):
                 node_to_delete.id,
                 next_nodes,
             )
+            if not graph[node_position_id]["children"]:
+                del graph[node_position_id]["children"]
 
         if not keep_info:
             del graph[str(node_to_delete.id)]
diff --git a/backend/src/baserow/contrib/automation/workflows/handler.py b/backend/src/baserow/contrib/automation/workflows/handler.py
index 02df73dc0f..55aa038ceb 100644
--- a/backend/src/baserow/contrib/automation/workflows/handler.py
+++ b/backend/src/baserow/contrib/automation/workflows/handler.py
@@ -440,23 +440,16 @@ def import_nodes(
 
         imported_nodes = []
 
-        for serialized_node in serialized_nodes:
-            # check that the node has not already been imported in a
-            # previous pass or if the parent doesn't exist yet.
-            imported_node = AutomationNodeHandler().import_node(
-                workflow,
-                serialized_node,
-                id_mapping,
-                import_export_config=import_export_config,
-                files_zip=files_zip,
-                storage=storage,
-                cache=cache,
-            )
-
-            imported_nodes.append(imported_node)
-
-            if progress:
-                progress.increment(state=IMPORT_SERIALIZED_IMPORTING)
+        imported_nodes = AutomationNodeHandler().import_nodes(
+            workflow,
+            serialized_nodes,
+            id_mapping,
+            import_export_config=import_export_config,
+            files_zip=files_zip,
+            storage=storage,
+            cache=cache,
+            progress=progress,
+        )
 
         return imported_nodes
 
@@ -957,3 +950,10 @@ def start_workflow(
                 history.message = history_message
                 history.status = history_status
                 history.save()
+            else:
+                # sample_data was updated as it's a simulation we should tell to
+                # the frontend
+                simulate_until_node.service.specific.refresh_from_db(
+                    fields=["sample_data"]
+                )
+                automation_node_updated.send(self, user=None, node=simulate_until_node)
diff --git a/backend/src/baserow/contrib/builder/api/elements/serializers.py b/backend/src/baserow/contrib/builder/api/elements/serializers.py
index ca4c9e37fb..727299da98 100644
--- a/backend/src/baserow/contrib/builder/api/elements/serializers.py
+++ b/backend/src/baserow/contrib/builder/api/elements/serializers.py
@@ -508,7 +508,7 @@ def to_representation(self, value):
         if not is_formula:
             # We force the type to raw as it's not a formula
             # For compat with unmigrated values.
-            value["mode"] = "raw"
+            value["mode"] = BASEROW_FORMULA_MODE_RAW
 
         return value
 
diff --git a/backend/src/baserow/contrib/builder/elements/collection_field_types.py b/backend/src/baserow/contrib/builder/elements/collection_field_types.py
index 1d372c78ee..5e6601fda0 100644
--- a/backend/src/baserow/contrib/builder/elements/collection_field_types.py
+++ b/backend/src/baserow/contrib/builder/elements/collection_field_types.py
@@ -10,7 +10,7 @@
 from baserow.contrib.builder.workflow_actions.models import BuilderWorkflowAction
 from baserow.core.constants import RatingStyleChoices
 from baserow.core.formula.serializers import FormulaSerializerField
-from baserow.core.formula.types import BaserowFormulaObject
+from baserow.core.formula.types import BASEROW_FORMULA_MODE_RAW, BaserowFormulaObject
 from baserow.core.registry import Instance
 
 
@@ -186,7 +186,9 @@ def formula_generator(
         for index, page_parameter in enumerate(
             collection_field.config.get("page_parameters") or []
         ):
-            new_formula = yield page_parameter.get("value")
+            new_formula = yield BaserowFormulaObject.to_formula(
+                page_parameter.get("value")
+            )
             if new_formula is not None:
                 collection_field.config["page_parameters"][index]["value"] = new_formula
                 yield collection_field
@@ -194,7 +196,9 @@ def formula_generator(
         for index, query_parameter in enumerate(
             collection_field.config.get("query_parameters") or []
         ):
-            new_formula = yield query_parameter.get("value")
+            new_formula = yield BaserowFormulaObject.to_formula(
+                query_parameter.get("value")
+            )
             if new_formula is not None:
                 collection_field.config["query_parameters"][index][
                     "value"
@@ -266,11 +270,18 @@ def formula_generator(
 
         yield from super().formula_generator(collection_field)
 
-        if collection_field.config.get("colors_is_formula"):
-            new_formula = yield collection_field.config.get("colors", "")
-            if new_formula is not None:
-                collection_field.config["colors"] = new_formula
-                yield collection_field
+        is_formula = collection_field.config.get("colors_is_formula", False)
+        colors = BaserowFormulaObject.to_formula(
+            collection_field.config.get("colors", "")
+        )
+
+        if not is_formula:
+            colors["mode"] = BASEROW_FORMULA_MODE_RAW
+
+        new_formula = yield colors
+        if new_formula is not None:
+            collection_field.config["colors"] = new_formula
+            yield collection_field
 
 
 class ButtonCollectionFieldType(CollectionFieldType):
diff --git a/backend/src/baserow/contrib/builder/elements/element_types.py b/backend/src/baserow/contrib/builder/elements/element_types.py
index c08e8e9469..e4e8549ec6 100644
--- a/backend/src/baserow/contrib/builder/elements/element_types.py
+++ b/backend/src/baserow/contrib/builder/elements/element_types.py
@@ -1007,21 +1007,13 @@ def formula_generator(
         yield from super().formula_generator(element)
 
         for index, data in enumerate(element.page_parameters):
-            new_formula = (
-                yield data["value"]
-                if isinstance(data["value"], str)
-                else data["value"]["formula"]
-            )
+            new_formula = yield BaserowFormulaObject.to_formula(data["value"])
             if new_formula is not None:
                 element.page_parameters[index]["value"] = new_formula
                 yield element
 
         for index, data in enumerate(element.query_parameters or []):
-            new_formula = (
-                yield data["value"]
-                if isinstance(data["value"], str)
-                else data["value"]["formula"]
-            )
+            new_formula = yield BaserowFormulaObject.to_formula(data["value"])
             if new_formula is not None:
                 element.query_parameters[index]["value"] = new_formula
                 yield element
@@ -2503,20 +2495,21 @@ def formula_generator(
 
         for item in element.menu_items.all():
             for index, data in enumerate(item.page_parameters or []):
-                new_formula = yield data["value"]
+                new_formula = yield BaserowFormulaObject.to_formula(data["value"])
                 if new_formula is not None:
                     item.page_parameters[index]["value"] = new_formula
                     yield item
 
             for index, data in enumerate(item.query_parameters or []):
-                new_formula = yield data["value"]
+                new_formula = yield BaserowFormulaObject.to_formula(data["value"])
                 if new_formula is not None:
                     item.query_parameters[index]["value"] = new_formula
                     yield item
 
             for formula_field in NavigationElementManager.simple_formula_fields:
-                formula = getattr(item, formula_field, "")
-                new_formula = yield formula
+                new_formula = yield BaserowFormulaObject.to_formula(
+                    getattr(item, formula_field, "")
+                )
                 if new_formula is not None:
                     setattr(item, formula_field, new_formula)
                     yield item
diff --git a/backend/src/baserow/contrib/builder/elements/registries.py b/backend/src/baserow/contrib/builder/elements/registries.py
index 93f7d46675..45d1b28ac6 100644
--- a/backend/src/baserow/contrib/builder/elements/registries.py
+++ b/backend/src/baserow/contrib/builder/elements/registries.py
@@ -23,6 +23,7 @@
 from baserow.contrib.builder.formula_importer import import_formula
 from baserow.contrib.builder.mixins import BuilderInstanceWithFormulaMixin
 from baserow.contrib.builder.pages.models import Page
+from baserow.core.formula.types import BaserowFormulaObject
 from baserow.core.models import Workspace
 from baserow.core.registry import (
     CustomFieldsInstanceMixin,
@@ -586,7 +587,7 @@ def formula_generator(
 
         for formula_field in self.simple_formula_fields:
             formula = collection_field.config.get(formula_field, "")
-            new_formula = yield formula
+            new_formula = yield BaserowFormulaObject.to_formula(formula)
             if new_formula is not None:
                 collection_field.config[formula_field] = new_formula
                 yield collection_field
diff --git a/backend/src/baserow/contrib/builder/formula_importer.py b/backend/src/baserow/contrib/builder/formula_importer.py
index 50a3ad879f..c411797b79 100644
--- a/backend/src/baserow/contrib/builder/formula_importer.py
+++ b/backend/src/baserow/contrib/builder/formula_importer.py
@@ -4,6 +4,7 @@
     builder_data_provider_type_registry,
 )
 from baserow.core.formula import BaserowFormulaObject, get_parse_tree_for_formula
+from baserow.core.formula.types import BASEROW_FORMULA_MODE_RAW
 from baserow.core.services.formula_importer import BaserowFormulaImporter
 
 
@@ -20,7 +21,7 @@ def get_data_provider_type_registry(self):
 
 def import_formula(
     formula: Union[str, BaserowFormulaObject], id_mapping: Dict[str, str], **kwargs
-) -> str:
+) -> BaserowFormulaObject:
     """
     When a formula is used in a service, it must be migrated when we import it because
     it could contain IDs referencing other objects. For example, the formula
@@ -45,11 +46,17 @@ def import_formula(
     :return: The updated formula (same type as input - string or object).
     """
 
-    # Figure out what our formula string is.
-    formula_str = formula if isinstance(formula, str) else formula["formula"]
+    formula = BaserowFormulaObject.to_formula(formula)
 
-    if not formula_str:
-        return formula_str
+    if formula["mode"] == BASEROW_FORMULA_MODE_RAW or not formula["formula"]:
+        return formula
 
-    tree = get_parse_tree_for_formula(formula_str)
-    return BuilderFormulaImporter(id_mapping, **kwargs).visit(tree)
+    tree = get_parse_tree_for_formula(formula["formula"])
+    new_formula = BuilderFormulaImporter(id_mapping, **kwargs).visit(tree)
+
+    if new_formula != formula["formula"]:
+        # We create a new instance to show it's a different formula
+        formula = dict(formula)
+        formula["formula"] = new_formula
+
+    return formula
diff --git a/backend/src/baserow/contrib/builder/formula_property_extractor.py b/backend/src/baserow/contrib/builder/formula_property_extractor.py
index f45fd781c0..4a85fda514 100644
--- a/backend/src/baserow/contrib/builder/formula_property_extractor.py
+++ b/backend/src/baserow/contrib/builder/formula_property_extractor.py
@@ -82,6 +82,9 @@ def visitFunctionCall(self, ctx: BaserowFormula.FunctionCallContext):
                 # we can ignore it. Maybe the related data source is gone.
                 pass
 
+    def visitBinaryOp(self, ctx: BaserowFormula.BinaryOpContext):
+        return self.visitChildren(ctx)
+
 
 def get_element_property_names(
     elements: List[Element],
diff --git a/backend/src/baserow/contrib/builder/mixins.py b/backend/src/baserow/contrib/builder/mixins.py
index 492503cd94..a02509452b 100644
--- a/backend/src/baserow/contrib/builder/mixins.py
+++ b/backend/src/baserow/contrib/builder/mixins.py
@@ -1,6 +1,7 @@
 from baserow.contrib.builder.formula_property_extractor import FormulaFieldVisitor
 from baserow.core.formula.parser.exceptions import BaserowFormulaSyntaxError
 from baserow.core.formula.parser.parser import get_parse_tree_for_formula
+from baserow.core.formula.types import BaserowFormulaObject
 from baserow.core.registry import InstanceWithFormulaMixin
 from baserow.core.utils import merge_dicts_no_duplicates
 
@@ -11,7 +12,7 @@ def extract_properties(self, instance, **kwargs):
 
         for formula in self.formula_generator(instance):
             # Figure out what our formula string is.
-            formula_str = formula if isinstance(formula, str) else formula["formula"]
+            formula_str = BaserowFormulaObject.to_formula(formula)["formula"]
 
             if not formula_str:
                 continue
diff --git a/backend/src/baserow/contrib/builder/workflow_actions/workflow_action_types.py b/backend/src/baserow/contrib/builder/workflow_actions/workflow_action_types.py
index 4d4e1f1df7..c12046c7e0 100644
--- a/backend/src/baserow/contrib/builder/workflow_actions/workflow_action_types.py
+++ b/backend/src/baserow/contrib/builder/workflow_actions/workflow_action_types.py
@@ -137,13 +137,17 @@ def formula_generator(
         yield from super().formula_generator(workflow_action)
 
         for index, page_parameter in enumerate(workflow_action.page_parameters):
-            new_formula = yield page_parameter.get("value")
+            new_formula = yield BaserowFormulaObject.to_formula(
+                page_parameter.get("value")
+            )
             if new_formula is not None:
                 workflow_action.page_parameters[index]["value"] = new_formula
                 yield workflow_action
 
         for index, query_parameter in enumerate(workflow_action.query_parameters or []):
-            new_formula = yield query_parameter.get("value")
+            new_formula = yield BaserowFormulaObject.to_formula(
+                query_parameter.get("value")
+            )
             if new_formula is not None:
                 workflow_action.query_parameters[index]["value"] = new_formula
                 yield workflow_action
diff --git a/backend/src/baserow/contrib/integrations/ai/service_types.py b/backend/src/baserow/contrib/integrations/ai/service_types.py
index b8b7b934a6..55873f8e76 100644
--- a/backend/src/baserow/contrib/integrations/ai/service_types.py
+++ b/backend/src/baserow/contrib/integrations/ai/service_types.py
@@ -22,6 +22,7 @@
 from baserow.core.services.dispatch_context import DispatchContext
 from baserow.core.services.exceptions import (
     ServiceImproperlyConfiguredDispatchException,
+    UnexpectedDispatchException,
 )
 from baserow.core.services.registries import DispatchTypes, ServiceType
 from baserow.core.services.types import DispatchResult, FormulaToResolve, ServiceDict
@@ -91,7 +92,7 @@ class AIAgentServiceType(ServiceType):
             help_text="The prompt to send to the AI model. Can be a formula.",
         ),
         "ai_choices": serializers.ListField(
-            child=serializers.CharField(),
+            child=serializers.CharField(allow_blank=True),
             required=False,
             default=list,
             help_text="List of choice options for 'choice' output type.",
@@ -163,16 +164,12 @@ def formulas_to_resolve(
             'property "ai_prompt"',
         )
 
-    def resolve_service_formulas(
+    def dispatch_data(
         self,
         service: AIAgentService,
+        resolved_values: Dict[str, Any],
         dispatch_context: DispatchContext,
     ) -> Dict[str, Any]:
-        if not service.integration_id:
-            raise ServiceImproperlyConfiguredDispatchException(
-                "The integration property is missing."
-            )
-
         if not service.ai_generative_ai_type:
             raise ServiceImproperlyConfiguredDispatchException(
                 "The AI provider type is missing."
@@ -185,7 +182,9 @@ def resolve_service_formulas(
 
         # Check if prompt formula is set (FormulaField returns empty string when not
         # set)
-        if not service.ai_prompt or str(service.ai_prompt).strip() == "":
+        prompt = resolved_values.get("ai_prompt", "")
+
+        if not prompt:
             raise ServiceImproperlyConfiguredDispatchException("The prompt is missing.")
 
         if service.ai_output_type == AIOutputType.CHOICE:
@@ -200,15 +199,6 @@ def resolve_service_formulas(
                     "At least one non-empty choice is required when output type is 'choice'."
                 )
 
-        return super().resolve_service_formulas(service, dispatch_context)
-
-    def dispatch_data(
-        self,
-        service: AIAgentService,
-        resolved_values: Dict[str, Any],
-        dispatch_context: DispatchContext,
-    ) -> Dict[str, Any]:
-        prompt = resolved_values.get("ai_prompt", "")
         ai_model_type = generative_ai_model_type_registry.get(
             service.ai_generative_ai_type
         )
@@ -263,7 +253,7 @@ def dispatch_data(
                 **kwargs,
             )
         except GenerativeAIPromptError as e:
-            raise ServiceImproperlyConfiguredDispatchException(
+            raise UnexpectedDispatchException(
                 f"AI prompt execution failed: {str(e)}"
             ) from e
 
diff --git a/backend/src/baserow/contrib/integrations/core/service_types.py b/backend/src/baserow/contrib/integrations/core/service_types.py
index 0297af4979..a8342c1d57 100644
--- a/backend/src/baserow/contrib/integrations/core/service_types.py
+++ b/backend/src/baserow/contrib/integrations/core/service_types.py
@@ -49,6 +49,7 @@
     HTTPHeader,
     HTTPQueryParam,
 )
+from baserow.core.formula.types import BaserowFormulaObject
 from baserow.core.formula.validator import (
     ensure_array,
     ensure_boolean,
@@ -261,21 +262,21 @@ def formula_generator(
 
         # Return form_data formulas
         for fdata in service.form_data.all():
-            new_formula = yield fdata.value
+            new_formula = yield BaserowFormulaObject.to_formula(fdata.value)
             if new_formula is not None:
                 fdata.value = new_formula
                 yield fdata
 
         # Return headers formulas
         for header in service.headers.all():
-            new_formula = yield header.value
+            new_formula = yield BaserowFormulaObject.to_formula(header.value)
             if new_formula is not None:
                 header.value = new_formula
                 yield header
 
         # Return headers formulas
         for query_param in service.query_params.all():
-            new_formula = yield query_param.value
+            new_formula = yield BaserowFormulaObject.to_formula(query_param.value)
             if new_formula is not None:
                 query_param.value = new_formula
                 yield query_param
diff --git a/backend/src/baserow/contrib/integrations/local_baserow/api/serializers.py b/backend/src/baserow/contrib/integrations/local_baserow/api/serializers.py
index 8bcba5fb5f..f878ef52b2 100644
--- a/backend/src/baserow/contrib/integrations/local_baserow/api/serializers.py
+++ b/backend/src/baserow/contrib/integrations/local_baserow/api/serializers.py
@@ -4,10 +4,7 @@
     LocalBaserowTableServiceFilter,
     LocalBaserowTableServiceSort,
 )
-from baserow.core.formula.serializers import (
-    FormulaSerializerField,
-    OptionalFormulaSerializerField,
-)
+from baserow.core.formula.serializers import FormulaSerializerField
 
 
 class LocalBaserowTableServiceSortSerializer(serializers.ModelSerializer):
@@ -54,9 +51,8 @@ def to_internal_value(self, data):
 
 
 class LocalBaserowTableServiceFilterSerializer(serializers.ModelSerializer):
-    value = OptionalFormulaSerializerField(
+    value = FormulaSerializerField(
         help_text="A formula for the filter's value.",
-        is_formula_field_name="value_is_formula",
     )
     value_is_formula = serializers.BooleanField(
         default=False, help_text="Indicates whether the value is a formula or not."
diff --git a/backend/src/baserow/contrib/integrations/local_baserow/mixins.py b/backend/src/baserow/contrib/integrations/local_baserow/mixins.py
index 4e79bbf68e..c0b97d9cf6 100644
--- a/backend/src/baserow/contrib/integrations/local_baserow/mixins.py
+++ b/backend/src/baserow/contrib/integrations/local_baserow/mixins.py
@@ -23,6 +23,7 @@
 from baserow.core.formula import BaserowFormulaObject, resolve_formula
 from baserow.core.formula.registries import formula_runtime_function_registry
 from baserow.core.formula.serializers import FormulaSerializerField
+from baserow.core.formula.types import BASEROW_FORMULA_MODE_RAW
 from baserow.core.formula.validator import ensure_integer, ensure_string
 from baserow.core.registry import Instance
 from baserow.core.services.dispatch_context import DispatchContext
@@ -267,7 +268,11 @@ def get_dispatch_filters(
             model_field = model._meta.get_field(field_name)
             view_filter_type = view_filter_type_registry.get(service_filter.type)
 
-            if service_filter.value_is_formula:
+            # We need this test for compatibility purposes with old values
+            if (
+                service_filter.value_is_formula
+                or service_filter.value["mode"] == BASEROW_FORMULA_MODE_RAW
+            ):
                 try:
                     resolved_value = ensure_string(
                         resolve_formula(
@@ -278,7 +283,8 @@ def get_dispatch_filters(
                     )
                 except Exception as exc:
                     raise ServiceImproperlyConfiguredDispatchException(
-                        f"The {field_name} service filter formula can't be resolved: {exc}"
+                        f"The {field_name} service filter formula can't be "
+                        "resolved: {exc}"
                     ) from exc
             else:
                 resolved_value = service_filter.value["formula"]
@@ -303,13 +309,18 @@ def formula_generator(
         yield from super().formula_generator(service)
 
         for service_filter in service.service_filters_with_untrashed_fields:
-            if service_filter.value_is_formula:
-                # Service types like LocalBaserowGetRow do not have a value attribute.
-                new_formula = yield service_filter.value
-                if new_formula is not None:
-                    # Set the new formula for the Service Filter
-                    service_filter.value = new_formula
-                    yield service_filter
+            is_formula = service_filter.value_is_formula
+            formula = BaserowFormulaObject.to_formula(service_filter.value)
+
+            if not is_formula:
+                formula["mode"] = BASEROW_FORMULA_MODE_RAW
+
+            # Service types like LocalBaserowGetRow do not have a value attribute.
+            new_formula = yield formula
+            if new_formula is not None:
+                # Set the new formula for the Service Filter
+                service_filter.value = new_formula
+                yield service_filter
 
     def get_table_queryset(
         self,
diff --git a/backend/src/baserow/contrib/integrations/local_baserow/service_types.py b/backend/src/baserow/contrib/integrations/local_baserow/service_types.py
index 5739760cc3..b28c11bd15 100644
--- a/backend/src/baserow/contrib/integrations/local_baserow/service_types.py
+++ b/backend/src/baserow/contrib/integrations/local_baserow/service_types.py
@@ -103,6 +103,7 @@
     guess_json_type_from_response_serializer_field,
 )
 from baserow.core.cache import global_cache
+from baserow.core.formula.types import BaserowFormulaObject
 from baserow.core.handler import CoreHandler
 from baserow.core.registry import Instance
 from baserow.core.services.dispatch_context import DispatchContext
@@ -210,7 +211,7 @@ def _convert_allowed_field_names(self, service, allowed_fields):
 
         mapping = {
             field_obj["field"].db_column: field_obj["field"].name
-            for field_obj in self.get_table_field_objects(service)
+            for field_obj in self.get_table_field_objects(service) or []
         }
         return [mapping.get(f, f) for f in allowed_fields]
 
@@ -1801,7 +1802,7 @@ def formula_generator(
 
         # Return field_mapping formulas
         for field_mapping in service.field_mappings.all():
-            new_formula = yield field_mapping.value
+            new_formula = yield BaserowFormulaObject.to_formula(field_mapping.value)
             if new_formula is not None:
                 field_mapping.value = new_formula
                 yield field_mapping
diff --git a/backend/src/baserow/core/formula/__init__.py b/backend/src/baserow/core/formula/__init__.py
index fd4f19084c..627cdb61f0 100644
--- a/backend/src/baserow/core/formula/__init__.py
+++ b/backend/src/baserow/core/formula/__init__.py
@@ -10,6 +10,7 @@
     BaserowFormulaVisitor,
 )
 from baserow.core.formula.types import (
+    BASEROW_FORMULA_MODE_RAW,
     BaserowFormulaObject,
     FormulaContext,
     FunctionCollection,
@@ -44,7 +45,10 @@ def resolve_formula(
 
     # If we receive a blank formula string, don't attempt to parse it.
     if not formula["formula"]:
-        return ""
+        return formula["formula"]
+
+    if formula["mode"] == BASEROW_FORMULA_MODE_RAW:
+        return formula["formula"]
 
     tree = get_parse_tree_for_formula(formula["formula"])
     return BaserowPythonExecutor(functions, formula_context).visit(tree)
diff --git a/backend/src/baserow/core/formula/serializers.py b/backend/src/baserow/core/formula/serializers.py
index cdf3729e1c..ad01b16591 100644
--- a/backend/src/baserow/core/formula/serializers.py
+++ b/backend/src/baserow/core/formula/serializers.py
@@ -117,24 +117,3 @@ def to_internal_value(self, data: Union[str, Dict[str, str]]):
             return data
         except BaserowFormulaSyntaxError as e:
             raise ValidationError(f"The formula is invalid: {e}", code="invalid")
-
-
-@extend_schema_field(OpenApiTypes.STR)
-class OptionalFormulaSerializerField(FormulaSerializerField):
-    """
-    This field can be used to store a formula, or plain text, in the database. If
-    `value_is_formula` is `True`, then the value will be treated as a formula and
-    `FormulaSerializerField` will be used to validate it. Otherwise, the value
-    will be treated as plain text.
-    """
-
-    def __init__(self, *args, is_formula_field_name=None, **kwargs):
-        self.is_formula_field_name = is_formula_field_name
-        super().__init__(*args, **kwargs)
-
-    def to_internal_value(self, data):
-        is_formula = self.parent.data.get(self.is_formula_field_name, False)
-        if not is_formula:
-            return data
-
-        return super().to_internal_value(data)
diff --git a/backend/src/baserow/core/registry.py b/backend/src/baserow/core/registry.py
index 4f8c5eda8e..a1719cc1a0 100644
--- a/backend/src/baserow/core/registry.py
+++ b/backend/src/baserow/core/registry.py
@@ -1032,8 +1032,10 @@ def formula_generator(
         """
 
         for formula_field in self.simple_formula_fields:
-            formula: Union[str, BaserowFormulaObject] = getattr(instance, formula_field)
-            new_formula = yield formula if isinstance(formula, str) else formula
+            formula: BaserowFormulaObject = BaserowFormulaObject.to_formula(
+                getattr(instance, formula_field)
+            )
+            new_formula = yield formula
             if new_formula is not None:
                 setattr(instance, formula_field, new_formula)
                 yield instance
diff --git a/backend/src/baserow/core/services/formula_importer.py b/backend/src/baserow/core/services/formula_importer.py
index 02100180d8..5613cfcfde 100644
--- a/backend/src/baserow/core/services/formula_importer.py
+++ b/backend/src/baserow/core/services/formula_importer.py
@@ -57,6 +57,7 @@ def _do_func_import(self, function_argument_expressions, function_name: str):
             data_provider_type = self.get_data_provider_type_registry().get(
                 data_provider_name
             )
+
             unquoted_arg_list = data_provider_type.import_path(
                 path, self.id_mapping, **self.extra_context
             )
@@ -66,7 +67,8 @@ def _do_func_import(self, function_argument_expressions, function_name: str):
         return f"{function_name}({','.join(args)})"
 
     def visitBinaryOp(self, ctx: BaserowFormula.BinaryOpContext):
-        return ctx.getText()
+        args = [expr.accept(self) for expr in (ctx.expr())]
+        return f" {ctx.op.text} ".join(args)
 
     def visitFunc_name(self, ctx: BaserowFormula.Func_nameContext):
         return ctx.getText()
diff --git a/backend/src/baserow/core/services/registries.py b/backend/src/baserow/core/services/registries.py
index abb84cdace..2a017a9970 100644
--- a/backend/src/baserow/core/services/registries.py
+++ b/backend/src/baserow/core/services/registries.py
@@ -356,8 +356,6 @@ def dispatch(
         :return: The service dispatch result if any.
         """
 
-        resolved_values = self.resolve_service_formulas(service, dispatch_context)
-
         # If simulated, try to return existing sample data
         if (
             dispatch_context.use_sample_data
@@ -370,22 +368,31 @@ def dispatch(
         ):
             return DispatchResult(**sample_data)
 
-        data = self.dispatch_data(service, resolved_values, dispatch_context)
-        serialized_data = self.dispatch_transform(data)
-
-        if dispatch_context.use_sample_data and (
-            dispatch_context.update_sample_data_for is None
-            or service in dispatch_context.update_sample_data_for
-        ):
-            sample_data = {}
-            for field in fields(serialized_data):
-                value = getattr(serialized_data, field.name)
-                sample_data[field.name] = value
-
-            service.sample_data = sample_data
-            service.save()
+        try:
+            resolved_values = self.resolve_service_formulas(service, dispatch_context)
+            data = self.dispatch_data(service, resolved_values, dispatch_context)
+            serialized_data = self.dispatch_transform(data)
+        except Exception as e:
+            if dispatch_context.use_sample_data and (
+                dispatch_context.update_sample_data_for is None
+                or service in dispatch_context.update_sample_data_for
+            ):
+                service.sample_data = {"_error": str(e)}
+                service.save()
+            raise
+        else:
+            if dispatch_context.use_sample_data and (
+                dispatch_context.update_sample_data_for is None
+                or service in dispatch_context.update_sample_data_for
+            ):
+                sample_data = {}
+                for field in fields(serialized_data):
+                    value = getattr(serialized_data, field.name)
+                    sample_data[field.name] = value
 
-        return serialized_data
+                service.sample_data = sample_data
+                service.save()
+            return serialized_data
 
     def remove_unused_field_names(
         self,
@@ -477,9 +484,6 @@ def import_serialized(
         import_formula: Callable[[str, Dict[str, Any]], str] = None,
         **kwargs,
     ):
-        if import_formula is None:
-            raise ValueError("Missing import formula function.")
-
         created_instance = super().import_serialized(
             parent,
             serialized_values,
@@ -488,11 +492,12 @@ def import_serialized(
             **kwargs,
         )
 
-        updated_models = self.import_formulas(
-            created_instance, id_mapping, import_formula, **kwargs
-        )
+        if import_formula is not None:
+            updated_models = self.import_formulas(
+                created_instance, id_mapping, import_formula, **kwargs
+            )
 
-        [m.save() for m in updated_models]
+            [m.save() for m in updated_models]
 
         return created_instance
 
diff --git a/backend/tests/baserow/contrib/automation/nodes/test_node_actions.py b/backend/tests/baserow/contrib/automation/nodes/test_node_actions.py
index fa7020d169..62a335ef06 100644
--- a/backend/tests/baserow/contrib/automation/nodes/test_node_actions.py
+++ b/backend/tests/baserow/contrib/automation/nodes/test_node_actions.py
@@ -406,7 +406,7 @@ def test_delete_node_action_after_nothing(data_fixture):
     workflow.assert_reference(
         {
             "0": "rows_created",
-            "Before": {"next": {"": []}},
+            "Before": {},
             "rows_created": {"next": {"": ["Before"]}},
         }
     )
@@ -435,7 +435,7 @@ def test_delete_node_action_after_nothing(data_fixture):
     workflow.assert_reference(
         {
             "0": "rows_created",
-            "Before": {"next": {"": []}},
+            "Before": {},
             "rows_created": {"next": {"": ["Before"]}},
         }
     )
@@ -648,7 +648,7 @@ def test_move_node_action(data_fixture):
             "rows_created": {"next": {"": ["first action"]}},
             "first action": {"next": {"": ["moved node"]}},
             "moved node": {"next": {"": ["second action"]}},
-            "second action": {"next": {"": []}},
+            "second action": {},
         }
     )
 
@@ -672,7 +672,7 @@ def test_move_node_action(data_fixture):
             "rows_created": {"next": {"": ["first action"]}},
             "first action": {"next": {"": ["moved node"]}},
             "moved node": {"next": {"": ["second action"]}},
-            "second action": {"next": {"": []}},
+            "second action": {},
         }
     )
 
@@ -726,7 +726,6 @@ def test_move_node_action_to_output(data_fixture):
             "router": {
                 "next": {
                     "Do this": ["output edge 2"],
-                    "Do that": [],
                     "Default": ["fallback node"],
                 }
             },
@@ -764,7 +763,6 @@ def test_move_node_action_to_output(data_fixture):
             "router": {
                 "next": {
                     "Do this": ["output edge 2"],
-                    "Do that": [],
                     "Default": ["fallback node"],
                 }
             },
diff --git a/backend/tests/baserow/contrib/automation/nodes/test_node_service.py b/backend/tests/baserow/contrib/automation/nodes/test_node_service.py
index bb381e015b..524e1c4a2d 100644
--- a/backend/tests/baserow/contrib/automation/nodes/test_node_service.py
+++ b/backend/tests/baserow/contrib/automation/nodes/test_node_service.py
@@ -530,7 +530,6 @@ def test_move_node_to_edge_above_existing_output(data_fixture: Fixtures):
             "router": {
                 "next": {
                     "Do this": ["output edge 2"],
-                    "Do that": [],
                     "Default": ["fallback node"],
                 }
             },
@@ -621,7 +620,7 @@ def test_move_node_outside_of_container(data_fixture: Fixtures):
             "0": "rows_created",
             "rows_created": {"next": {"": ["action1"]}},
             "action1": {"next": {"": ["iterator"]}},
-            "iterator": {"children": [], "next": {"": ["action3"]}},
+            "iterator": {"next": {"": ["action3"]}},
             "action2": {"next": {"": ["action4"]}},
             "action3": {"next": {"": ["action2"]}},
             "action4": {},
diff --git a/backend/tests/baserow/contrib/automation/workflows/test_graph_handler.py b/backend/tests/baserow/contrib/automation/workflows/test_graph_handler.py
index 740fcd2817..e4c6b2c482 100644
--- a/backend/tests/baserow/contrib/automation/workflows/test_graph_handler.py
+++ b/backend/tests/baserow/contrib/automation/workflows/test_graph_handler.py
@@ -738,7 +738,7 @@ def test_graph_handler_replace(
                 "2": {"next": {"": [3]}},
                 "3": {"children": [7], "next": {"": [4]}},
                 "4": {"next": {"": [5], "randomUid": [9]}},
-                "7": {"next": {"": []}},
+                "7": {},
                 "8": {"children": []},
                 "9": {"next": {"anotherUid": [8]}},
             },
diff --git a/backend/tests/baserow/contrib/builder/api/data_sources/test_data_source_views.py b/backend/tests/baserow/contrib/builder/api/data_sources/test_data_source_views.py
index f0aef11f75..ed26d0a5f8 100644
--- a/backend/tests/baserow/contrib/builder/api/data_sources/test_data_source_views.py
+++ b/backend/tests/baserow/contrib/builder/api/data_sources/test_data_source_views.py
@@ -18,7 +18,11 @@
 from baserow.contrib.database.rows.handler import RowHandler
 from baserow.contrib.database.views.models import SORT_ORDER_ASC
 from baserow.core.formula.field import BASEROW_FORMULA_VERSION_INITIAL
-from baserow.core.formula.types import BASEROW_FORMULA_MODE_SIMPLE, BaserowFormulaObject
+from baserow.core.formula.types import (
+    BASEROW_FORMULA_MODE_RAW,
+    BASEROW_FORMULA_MODE_SIMPLE,
+    BaserowFormulaObject,
+)
 from baserow.core.services.models import Service
 from baserow.core.user_sources.user_source_user import UserSourceUser
 from baserow.test_utils.helpers import AnyInt, AnyStr, setup_interesting_test_table
@@ -360,7 +364,7 @@ def test_update_data_source_with_filters(api_client, data_fixture):
                     "value": BaserowFormulaObject(
                         formula="foobar",
                         version=BASEROW_FORMULA_VERSION_INITIAL,
-                        mode=BASEROW_FORMULA_MODE_SIMPLE,
+                        mode=BASEROW_FORMULA_MODE_RAW,
                     ),
                     "value_is_formula": False,
                 },
@@ -391,7 +395,7 @@ def test_update_data_source_with_filters(api_client, data_fixture):
             "value": BaserowFormulaObject(
                 formula="foobar",
                 version=BASEROW_FORMULA_VERSION_INITIAL,
-                mode=BASEROW_FORMULA_MODE_SIMPLE,
+                mode=BASEROW_FORMULA_MODE_RAW,
             ),
             "trashed": False,
             "value_is_formula": False,
@@ -436,7 +440,7 @@ def test_update_data_source_with_filters(api_client, data_fixture):
                     "value": BaserowFormulaObject(
                         formula="foobar",
                         version=BASEROW_FORMULA_VERSION_INITIAL,
-                        mode=BASEROW_FORMULA_MODE_SIMPLE,
+                        mode=BASEROW_FORMULA_MODE_RAW,
                     ),
                     "value_is_formula": False,
                 }
@@ -457,7 +461,7 @@ def test_update_data_source_with_filters(api_client, data_fixture):
             "value": BaserowFormulaObject(
                 formula="foobar",
                 version=BASEROW_FORMULA_VERSION_INITIAL,
-                mode=BASEROW_FORMULA_MODE_SIMPLE,
+                mode=BASEROW_FORMULA_MODE_RAW,
             ),
             "trashed": False,
             "value_is_formula": False,
diff --git a/backend/tests/baserow/contrib/builder/data_providers/test_data_provider_types.py b/backend/tests/baserow/contrib/builder/data_providers/test_data_provider_types.py
index 49827c23ad..8fcde6df92 100644
--- a/backend/tests/baserow/contrib/builder/data_providers/test_data_provider_types.py
+++ b/backend/tests/baserow/contrib/builder/data_providers/test_data_provider_types.py
@@ -39,6 +39,7 @@
     InvalidRuntimeFormula,
 )
 from baserow.core.formula.registries import DataProviderType
+from baserow.core.formula.types import BaserowFormulaObject
 from baserow.core.services.exceptions import (
     ServiceImproperlyConfiguredDispatchException,
 )
@@ -796,9 +797,12 @@ def test_data_source_formula_import_only_datasource(data_fixture):
     id_mapping = defaultdict(lambda: MirrorDict())
     id_mapping["builder_data_sources"] = {data_source.id: data_source2.id}
 
-    result = import_formula(f"get('data_source.{data_source.id}.field_10')", id_mapping)
+    result = import_formula(
+        BaserowFormulaObject.create(f"get('data_source.{data_source.id}.field_10')"),
+        id_mapping,
+    )
 
-    assert result == f"get('data_source.{data_source2.id}.field_10')"
+    assert result["formula"] == f"get('data_source.{data_source2.id}.field_10')"
 
 
 @pytest.mark.django_db
@@ -819,10 +823,15 @@ def test_data_source_formula_import_get_row_datasource_and_field(data_fixture):
     id_mapping["database_fields"] = {field_1.id: field_2.id}
 
     result = import_formula(
-        f"get('data_source.{data_source.id}.field_{field_1.id}')", id_mapping
+        BaserowFormulaObject.create(
+            f"get('data_source.{data_source.id}.field_{field_1.id}')"
+        ),
+        id_mapping,
     )
 
-    assert result == f"get('data_source.{data_source2.id}.field_{field_2.id}')"
+    assert (
+        result["formula"] == f"get('data_source.{data_source2.id}.field_{field_2.id}')"
+    )
 
 
 @pytest.mark.django_db
@@ -841,10 +850,16 @@ def test_data_source_formula_import_list_row_datasource_and_field(data_fixture):
     id_mapping["database_fields"] = {field_1.id: field_2.id}
 
     result = import_formula(
-        f"get('data_source.{data_source.id}.10.field_{field_1.id}')", id_mapping
+        BaserowFormulaObject.create(
+            f"get('data_source.{data_source.id}.10.field_{field_1.id}')"
+        ),
+        id_mapping,
     )
 
-    assert result == f"get('data_source.{data_source2.id}.10.field_{field_2.id}')"
+    assert (
+        result["formula"]
+        == f"get('data_source.{data_source2.id}.10.field_{field_2.id}')"
+    )
 
 
 @pytest.mark.django_db
@@ -852,15 +867,19 @@ def test_data_source_formula_import_missing_get_row_datasource(data_fixture):
     id_mapping = defaultdict(lambda: MirrorDict())
     id_mapping["builder_data_sources"] = {}
 
-    result = import_formula(f"get('data_source.42.field_24')", id_mapping)
+    result = import_formula(
+        BaserowFormulaObject.create("get('data_source.42.field_24')"), id_mapping
+    )
 
-    assert result == f"get('data_source.42.field_24')"
+    assert result["formula"] == f"get('data_source.42.field_24')"
 
     id_mapping["builder_data_sources"] = {42: 42}
 
-    result = import_formula(f"get('data_source.42.field_24')", id_mapping)
+    result = import_formula(
+        BaserowFormulaObject.create("get('data_source.42.field_24')"), id_mapping
+    )
 
-    assert result == f"get('data_source.42.field_24')"
+    assert result["formula"] == "get('data_source.42.field_24')"
 
 
 @pytest.mark.django_db
@@ -988,12 +1007,12 @@ def test_table_element_formula_migration_with_current_row_provider(data_fixture)
     id_mapping["database_fields"] = {fields[0].id: fields2[0].id}
 
     result = import_formula(
-        f"get('current_record.field_{fields[0].id}')",
+        BaserowFormulaObject.create(f"get('current_record.field_{fields[0].id}')"),
         id_mapping,
         data_source_id=data_source2.id,
     )
 
-    assert result == f"get('current_record.field_{fields2[0].id}')"
+    assert result["formula"] == f"get('current_record.field_{fields2[0].id}')"
 
 
 @pytest.mark.django_db
diff --git a/backend/tests/baserow/contrib/builder/elements/test_tags_collection_field_type.py b/backend/tests/baserow/contrib/builder/elements/test_tags_collection_field_type.py
index 7f3cfbe974..953eb09f57 100644
--- a/backend/tests/baserow/contrib/builder/elements/test_tags_collection_field_type.py
+++ b/backend/tests/baserow/contrib/builder/elements/test_tags_collection_field_type.py
@@ -3,7 +3,10 @@
 from baserow.contrib.builder.pages.service import PageService
 from baserow.core.formula import BaserowFormulaObject
 from baserow.core.formula.field import BASEROW_FORMULA_VERSION_INITIAL
-from baserow.core.formula.types import BASEROW_FORMULA_MODE_SIMPLE
+from baserow.core.formula.types import (
+    BASEROW_FORMULA_MODE_RAW,
+    BASEROW_FORMULA_MODE_SIMPLE,
+)
 
 
 @pytest.mark.django_db
@@ -90,6 +93,6 @@ def test_import_export_tags_collection_field_type(data_fixture):
         "colors": BaserowFormulaObject(
             formula="#d06060ff",
             version=BASEROW_FORMULA_VERSION_INITIAL,
-            mode=BASEROW_FORMULA_MODE_SIMPLE,
+            mode=BASEROW_FORMULA_MODE_RAW,
         ),
     }
diff --git a/backend/tests/baserow/contrib/builder/test_formula_importer.py b/backend/tests/baserow/contrib/builder/test_formula_importer.py
index dea9736812..fb5d7e4b3b 100644
--- a/backend/tests/baserow/contrib/builder/test_formula_importer.py
+++ b/backend/tests/baserow/contrib/builder/test_formula_importer.py
@@ -4,6 +4,7 @@
 import pytest
 
 from baserow.contrib.builder.formula_importer import import_formula
+from baserow.core.formula import BaserowFormulaObject
 from baserow.core.formula.registries import DataProviderType
 from baserow.core.formula.runtime_formula_context import RuntimeFormulaContext
 from baserow.core.utils import MirrorDict
@@ -13,12 +14,22 @@
     {"input": "42", "output": "42"},
     {"input": "'test'", "output": "'test'"},
     {"input": "1 + 2", "output": "1 + 2"},
+    {
+        "input": "get('test_provider.1.10') = 'test'",
+        "output": "get('test_provider.1.10') = 'test'",
+        "output2": "get('test_provider.10.42') = 'test'",
+    },
     {
         "input": "get('test_provider.1.10')",
         "output": "get('test_provider.1.10')",
         "output2": "get('test_provider.10.42')",
     },
     {"input": "concat('foo','bar')", "output": "concat('foo','bar')"},
+    {
+        "input": "concat(get('test_provider.1.10'),'bar')",
+        "output": "concat(get('test_provider.1.10'),'bar')",
+        "output2": "concat(get('test_provider.10.42'),'bar')",
+    },
 ]
 
 
@@ -59,9 +70,9 @@ def test_formula_import_formula(formula, mutable_builder_data_provider_registry)
 
     id_mapping = defaultdict(lambda: MirrorDict())
 
-    result = import_formula(formula["input"], id_mapping)
+    result = import_formula(BaserowFormulaObject.create(formula["input"]), id_mapping)
 
-    assert result == formula["output"]
+    assert result["formula"] == formula["output"]
 
 
 @pytest.mark.django_db
@@ -74,6 +85,6 @@ def test_formula_import_formula_with_import(
     id_mapping["first"] = {1: 10}
     id_mapping["second"] = {10: 42}
 
-    result = import_formula(formula["input"], id_mapping)
+    result = import_formula(BaserowFormulaObject.create(formula["input"]), id_mapping)
 
-    assert result == formula.get("output2", formula["output"])
+    assert result["formula"] == formula.get("output2", formula["output"])
diff --git a/backend/tests/baserow/contrib/builder/test_formula_property_extractor.py b/backend/tests/baserow/contrib/builder/test_formula_property_extractor.py
index 61bee30420..30dd948d7b 100644
--- a/backend/tests/baserow/contrib/builder/test_formula_property_extractor.py
+++ b/backend/tests/baserow/contrib/builder/test_formula_property_extractor.py
@@ -96,7 +96,9 @@ def test_get_builder_used_property_names_returns_all_property_names(data_fixture
             {
                 "name": "FieldA",
                 "type": "text",
-                "config": {"value": f"get('current_record.field_{fields[0].id}')"},
+                "config": {
+                    "value": f"get('current_record.field_{fields[0].id}') = 'test'"
+                },
             },
             {
                 "name": "FieldB",
diff --git a/backend/tests/baserow/contrib/integrations/ai/test_ai_agent_service_type.py b/backend/tests/baserow/contrib/integrations/ai/test_ai_agent_service_type.py
index 410df2752d..7706d6f998 100644
--- a/backend/tests/baserow/contrib/integrations/ai/test_ai_agent_service_type.py
+++ b/backend/tests/baserow/contrib/integrations/ai/test_ai_agent_service_type.py
@@ -12,6 +12,7 @@
 from baserow.core.integrations.service import IntegrationService
 from baserow.core.services.exceptions import (
     ServiceImproperlyConfiguredDispatchException,
+    UnexpectedDispatchException,
 )
 from baserow.core.services.handler import ServiceHandler
 from baserow.test_utils.helpers import AnyInt
@@ -311,42 +312,6 @@ def test_ai_agent_service_dispatch_with_formula(data_fixture, settings):
     assert result.data == {"result": "Summary: AI technology article"}
 
 
-@pytest.mark.django_db
-def test_ai_agent_service_dispatch_missing_integration(data_fixture, settings):
-    settings.BASEROW_OPENAI_API_KEY = "sk-test"
-    settings.BASEROW_OPENAI_MODELS = ["gpt-4"]
-
-    user = data_fixture.create_user()
-    application = data_fixture.create_builder_application(user=user)
-
-    integration_type = AIIntegrationType()
-    integration = (
-        IntegrationService()
-        .create_integration(user, integration_type, application=application)
-        .specific
-    )
-
-    service = ServiceHandler().create_service(
-        AIAgentServiceType(),
-        integration_id=integration.id,
-        ai_generative_ai_type="openai",
-        ai_generative_ai_model="gpt-4",
-        ai_output_type="text",
-        ai_prompt="'Test'",
-    )
-
-    service.integration_id = None
-    service.save()
-
-    service_type = service.get_type()
-    dispatch_context = FakeDispatchContext()
-
-    with pytest.raises(ServiceImproperlyConfiguredDispatchException) as exc_info:
-        service_type.dispatch(service, dispatch_context)
-
-    assert "integration property is missing" in str(exc_info.value)
-
-
 @pytest.mark.django_db
 def test_ai_agent_service_dispatch_missing_provider(data_fixture, settings):
     settings.BASEROW_OPENAI_API_KEY = "sk-test"
@@ -480,7 +445,7 @@ def test_ai_agent_service_dispatch_ai_error(data_fixture, settings):
     service_type = service.get_type()
     dispatch_context = FakeDispatchContext()
 
-    with pytest.raises(ServiceImproperlyConfiguredDispatchException) as exc_info:
+    with pytest.raises(UnexpectedDispatchException) as exc_info:
         with mock_ai_prompt(should_fail=True):
             service_type.dispatch(service, dispatch_context)
 
diff --git a/web-frontend/modules/automation/components/form/SimulateDispatchNodeForm.vue b/web-frontend/modules/automation/components/form/SimulateDispatchNodeForm.vue
index ff19130841..76425e3055 100644
--- a/web-frontend/modules/automation/components/form/SimulateDispatchNodeForm.vue
+++ b/web-frontend/modules/automation/components/form/SimulateDispatchNodeForm.vue
@@ -22,9 +22,18 @@
       {{ $t('simulateDispatch.triggerNodeAwaitingEvent') }}
     </div>
 
-    <div v-if="hasSampleData && !isSimulating">
+    <div
+      v-if="hasSampleData && !isSimulating"
+      :class="{
+        'simulate-dispatch-node__sample-data--error': isErrorSample,
+      }"
+    >
       <div class="simulate-dispatch-node__sample-data-label">
-        {{ $t('simulateDispatch.sampleDataLabel') }}
+        {{
+          isErrorSample
+            ? $t('simulateDispatch.errorOccurred')
+            : $t('simulateDispatch.sampleDataLabel')
+        }}
       </div>
       <div class="simulate-dispatch-node__sample-data-code">
         <pre><code>{{ sampleData }}</code></pre>
@@ -38,7 +47,11 @@
       icon="iconoir-code-brackets simulate-dispatch-node__button-icon"
       @click="showSampleDataModal"
     >
-      {{ $t('simulateDispatch.buttonLabelShowPayload') }}
+      {{
+        isErrorSample
+          ? $t('simulateDispatch.buttonLabelShowError')
+          : $t('simulateDispatch.buttonLabelShowPayload')
+      }}
     </Button>
 
     <SampleDataModal
@@ -95,16 +108,25 @@ const nodeType = computed(() => app.$registry.get('node', props.node.type))
 
 const sampleData = computed(() => {
   const sample = nodeType.value.getSampleData(props.node)
-  if (nodeType.value.serviceType.returnsList && sample) {
-    return sample.results
+
+  if (sample?._error) {
+    return sample._error
+  }
+  if (nodeType.value.serviceType.returnsList && sample?.data) {
+    return sample.data.results
   }
-  return sample
+  return sample?.data
 })
 
 const hasSampleData = computed(() => {
   return Boolean(sampleData.value)
 })
 
+const isErrorSample = computed(() => {
+  const sample = nodeType.value.getSampleData(props.node)
+  return Boolean(sample?._error)
+})
+
 /**
  * All previous nodes must have been tested, i.e. they must have sample
  * data and shouldn't be in error.
@@ -130,7 +152,7 @@ const cantBeTestedReason = computed(() => {
       })
     }
 
-    if (!previousNodeType.getSampleData(previousNode)) {
+    if (!previousNodeType.getSampleData(previousNode)?.data) {
       return app.i18n.t('simulateDispatch.errorPreviousNodesNotTested', {
         node: nodeLabel,
       })
diff --git a/web-frontend/modules/automation/components/sidebar/SampleDataModal.vue b/web-frontend/modules/automation/components/sidebar/SampleDataModal.vue
index aa6279383c..22816e335f 100644
--- a/web-frontend/modules/automation/components/sidebar/SampleDataModal.vue
+++ b/web-frontend/modules/automation/components/sidebar/SampleDataModal.vue
@@ -27,7 +27,7 @@ export default {
   mixins: [modal],
   props: {
     sampleData: {
-      type: [Object, Array],
+      type: null,
       required: true,
     },
     title: {
diff --git a/web-frontend/modules/automation/components/workflow/WorkflowNode.vue b/web-frontend/modules/automation/components/workflow/WorkflowNode.vue
index b1771825d1..bb5dc3f474 100644
--- a/web-frontend/modules/automation/components/workflow/WorkflowNode.vue
+++ b/web-frontend/modules/automation/components/workflow/WorkflowNode.vue
@@ -75,7 +75,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { nextTick, ref, watch } from 'vue'
 import {
   useContext,
   computed,
@@ -124,6 +124,7 @@ const refs = instance.proxy.$refs
 const workflowNode = ref()
 const children = ref()
 const nodeComponent = ref()
+const coordsPerEdge = ref([])
 
 const nodeType = computed(() => app.$registry.get('node', props.node.type))
 const nodeEdges = computed(() => nodeType.value.getEdges({ node: props.node }))
@@ -141,27 +142,30 @@ const computeEdgeCoords = (wrapper, edgeElt, multiple = false) => {
 }
 
 /**
- * Compute all connector coordinates per edge
+ * Compute all connector coordinates per edge on edge changes
  */
-const coordsPerEdge = computed(() => {
-  if (!workflowNode.value || !nodeComponent.value) return []
-
-  return nodeEdges.value.map((edge) => {
-    const wrap = workflowNode.value
-    if (Array.isArray(refs[`edge-${edge.uid}`])) {
-      const edgeElt = refs[`edge-${edge.uid}`][0].$el
-
-      return [
-        edge.uid,
-        computeEdgeCoords(wrap, edgeElt, hasMultipleEdges.value),
-      ]
-    } else {
-      // We might have a delay between the edge addition
-      // and the branch being visible
-      return [edge.uid, { startX: 0, startY: 0, endX: 0, endY: 0 }]
-    }
-  })
-})
+watch(
+  nodeEdges,
+  async () => {
+    await nextTick()
+    coordsPerEdge.value = nodeEdges.value.map((edge) => {
+      const wrap = workflowNode.value
+      if (Array.isArray(refs[`edge-${edge.uid}`])) {
+        const edgeElt = refs[`edge-${edge.uid}`][0].$el
+
+        return [
+          edge.uid,
+          computeEdgeCoords(wrap, edgeElt, hasMultipleEdges.value),
+        ]
+      } else {
+        // We might have a delay between the edge addition
+        // and the branch being visible
+        return [edge.uid, { startX: 0, startY: 0, endX: 0, endY: 0 }]
+      }
+    })
+  },
+  { immediate: true }
+)
 
 const childEdgeCoords = computed(() => {
   if (nodeType.value.isContainer) {
diff --git a/web-frontend/modules/automation/locales/en.json b/web-frontend/modules/automation/locales/en.json
index f2a1a32215..be57570bb5 100644
--- a/web-frontend/modules/automation/locales/en.json
+++ b/web-frontend/modules/automation/locales/en.json
@@ -118,7 +118,7 @@
     "iteratorWithChildrenNodesDeleteError": "Cannot be deleted until its child nodes are removed.",
     "iteratorWithChildrenNodesReplaceError": "Cannot be replaced until its child nodes are removed.",
     "periodicTriggerLabel": "Periodic trigger",
-    "aiAgent": "AI Agent"
+    "aiAgent": "AI prompt"
   },
   "workflowNode": {
     "actionDelete": "Delete",
@@ -188,9 +188,11 @@
     "buttonLabelTestAgain": "Test event again",
     "testNodeDescription": "Test this event to confirm the configuration is correct. Data from this test can be used in later steps.",
     "buttonLabelShowPayload": "Show payload",
+    "buttonLabelShowError": "Show error",
     "sampleDataModalTitle": "Payload for {nodeLabel}",
     "sampleDataModalSubTitle": "JSON payload",
     "sampleDataCopy": "Copy",
+    "errorOccurred": "An error occurred...",
     "sampleDataCopied": "Payload copied to clipboard"
   }
 }
diff --git a/web-frontend/modules/core/assets/scss/components/automation/node/simulate_dispatch_node.scss b/web-frontend/modules/core/assets/scss/components/automation/node/simulate_dispatch_node.scss
index 4d913491ed..532c5eba97 100644
--- a/web-frontend/modules/core/assets/scss/components/automation/node/simulate_dispatch_node.scss
+++ b/web-frontend/modules/core/assets/scss/components/automation/node/simulate_dispatch_node.scss
@@ -12,6 +12,10 @@
 .simulate-dispatch-node__sample-data-label {
   font-weight: 500;
   margin-bottom: 10px;
+
+  .simulate-dispatch-node__sample-data--error & {
+    color: $palette-red-600;
+  }
 }
 
 .simulate-dispatch-node__sample-data-code {
@@ -30,6 +34,10 @@
     overflow: hidden;
     text-overflow: ellipsis;
   }
+
+  .simulate-dispatch-node__sample-data--error & {
+    background-color: $palette-red-50;
+  }
 }
 
 .simulate-dispatch-node__button-icon {
diff --git a/web-frontend/modules/core/formula/index.js b/web-frontend/modules/core/formula/index.js
index c7ef35a20b..2801a96337 100644
--- a/web-frontend/modules/core/formula/index.js
+++ b/web-frontend/modules/core/formula/index.js
@@ -16,7 +16,7 @@ export const resolveFormula = (
   RuntimeFormulaContext
 ) => {
   if (!formulaCtx.formula) {
-    return ''
+    return formulaCtx.formula
   }
 
   if (formulaCtx.mode === 'raw') {
@@ -29,7 +29,7 @@ export const resolveFormula = (
     return new JavascriptExecutor(functions, RuntimeFormulaContext).visit(tree)
   } catch (err) {
     console.debug(`FORMULA DEBUG: ${err}`)
-    return ''
+    return null
   }
 }
 
diff --git a/web-frontend/modules/core/serviceTypes.js b/web-frontend/modules/core/serviceTypes.js
index 588d31120d..9d8a8cf99e 100644
--- a/web-frontend/modules/core/serviceTypes.js
+++ b/web-frontend/modules/core/serviceTypes.js
@@ -52,10 +52,7 @@ export class ServiceType extends Registerable {
    * Returns sample data for the given service.
    */
   getSampleData(service) {
-    if (service.sample_data) {
-      return service.sample_data?.data
-    }
-    return null
+    return service.sample_data || null
   }
 
   /**
diff --git a/web-frontend/modules/core/utils/object.js b/web-frontend/modules/core/utils/object.js
index 7659b76c52..28bf9be4ac 100644
--- a/web-frontend/modules/core/utils/object.js
+++ b/web-frontend/modules/core/utils/object.js
@@ -117,12 +117,17 @@ export function isPromise(p) {
  * @param {any} defaultValue The value to return if the path is not found
  * @return {Object} The value held by the path
  */
-export function getValueAtPath(obj, path) {
+export function getValueAtPath(context, path) {
   function _getValueAtPath(obj, keys) {
     const [first, ...rest] = keys
     if (first === undefined || first === null) {
       return obj
     }
+
+    if (obj === null || obj === undefined) {
+      throw new Error(`Path '${path}' not found in context '${obj}'`)
+    }
+
     if (first in obj) {
       return _getValueAtPath(obj[first], rest)
     }
@@ -141,7 +146,7 @@ export function getValueAtPath(obj, path) {
     return null
   }
   const keys = typeof path === 'string' ? _.toPath(path) : path
-  return _getValueAtPath(obj, keys)
+  return _getValueAtPath(context, keys)
 }
 
 /**
diff --git a/web-frontend/modules/integrations/ai/components/services/AIAgentServiceForm.vue b/web-frontend/modules/integrations/ai/components/services/AIAgentServiceForm.vue
index 80fbad33bb..cf62592daa 100644
--- a/web-frontend/modules/integrations/ai/components/services/AIAgentServiceForm.vue
+++ b/web-frontend/modules/integrations/ai/components/services/AIAgentServiceForm.vue
@@ -14,135 +14,133 @@
       />
     </FormGroup>
 
-    <template v-if="values.integration_id">
-      <FormGroup
-        small-label
-        :label="$t('aiAgentServiceForm.providerLabel')"
-        required
-        class="margin-bottom-2"
+    <FormGroup
+      small-label
+      :label="$t('aiAgentServiceForm.providerLabel')"
+      required
+      class="margin-bottom-2"
+    >
+      <Dropdown
+        v-model="values.ai_generative_ai_type"
+        :placeholder="$t('aiAgentServiceForm.providerPlaceholder')"
       >
-        <Dropdown
-          v-model="values.ai_generative_ai_type"
-          :placeholder="$t('aiAgentServiceForm.providerPlaceholder')"
+        <DropdownItem
+          v-for="provider in availableProviders"
+          :key="provider.type"
+          :name="provider.name"
+          :value="provider.type"
         >
-          <DropdownItem
-            v-for="provider in availableProviders"
-            :key="provider.type"
-            :name="provider.name"
-            :value="provider.type"
-          >
-          </DropdownItem>
-        </Dropdown>
-      </FormGroup>
+        </DropdownItem>
+      </Dropdown>
+    </FormGroup>
 
-      <FormGroup
-        v-if="values.ai_generative_ai_type"
-        small-label
-        :label="$t('aiAgentServiceForm.modelLabel')"
-        required
-        class="margin-bottom-2"
+    <FormGroup
+      v-if="values.ai_generative_ai_type"
+      small-label
+      :label="$t('aiAgentServiceForm.modelLabel')"
+      required
+      class="margin-bottom-2"
+    >
+      <Dropdown
+        v-model="values.ai_generative_ai_model"
+        :placeholder="$t('aiAgentServiceForm.modelPlaceholder')"
       >
-        <Dropdown
-          v-model="values.ai_generative_ai_model"
-          :placeholder="$t('aiAgentServiceForm.modelPlaceholder')"
+        <DropdownItem
+          v-for="model in availableModels"
+          :key="model"
+          :name="model"
+          :value="model"
         >
-          <DropdownItem
-            v-for="model in availableModels"
-            :key="model"
-            :name="model"
-            :value="model"
-          >
-          </DropdownItem>
-        </Dropdown>
-      </FormGroup>
+        </DropdownItem>
+      </Dropdown>
+    </FormGroup>
 
-      <FormGroup
-        small-label
-        :label="$t('aiAgentServiceForm.outputTypeLabel')"
-        required
-        class="margin-bottom-2"
-      >
-        <RadioGroup
-          v-model="values.ai_output_type"
-          :options="outputTypeOptions"
-        />
-        <template #helper>
-          {{ $t('aiAgentServiceForm.outputTypeHelp') }}
-        </template>
-      </FormGroup>
+    <FormGroup
+      small-label
+      :label="$t('aiAgentServiceForm.promptLabel')"
+      :error="v$.values.ai_prompt.$error"
+      required
+      class="margin-bottom-2"
+    >
+      <InjectedFormulaInput
+        v-model="values.ai_prompt"
+        :placeholder="$t('aiAgentServiceForm.promptPlaceholder')"
+      />
+      <template #error>
+        <span v-if="!v$.values.ai_prompt.required" class="error">
+          {{ $t('error.requiredField') }}
+        </span>
+      </template>
+    </FormGroup>
 
-      <FormGroup
-        small-label
-        :label="$t('aiAgentServiceForm.temperatureLabel')"
-        class="margin-bottom-2"
+    <FormGroup
+      small-label
+      :label="$t('aiAgentServiceForm.outputTypeLabel')"
+      required
+      class="margin-bottom-2"
+    >
+      <RadioGroup
+        v-model="values.ai_output_type"
+        :options="outputTypeOptions"
+      />
+      <template #helper>
+        {{ $t('aiAgentServiceForm.outputTypeHelp') }}
+      </template>
+    </FormGroup>
+
+    <FormGroup
+      v-if="values.ai_output_type === 'choice'"
+      small-label
+      :label="$t('aiAgentServiceForm.choicesLabel')"
+      :error="v$.values.ai_choices.$error"
+      required
+      class="margin-bottom-2"
+    >
+      <div
+        v-for="(choice, index) in values.ai_choices"
+        :key="index"
+        class="margin-bottom-1 flex"
       >
         <FormInput
-          v-model.number="values.ai_temperature"
-          type="number"
-          :min="0"
-          :max="maxTemperature"
-          :step="0.1"
-          :placeholder="$t('aiAgentServiceForm.temperaturePlaceholder')"
+          :value="choice"
+          :placeholder="$t('aiAgentServiceForm.choicePlaceholder')"
+          class="flex-1 margin-right-1"
+          @input="updateChoice(index, $event)"
         />
-        <template #helper>
-          {{ $t('aiAgentServiceForm.temperatureHelp') }}
-        </template>
-      </FormGroup>
-
-      <FormGroup
-        small-label
-        :label="$t('aiAgentServiceForm.promptLabel')"
-        :error="v$.values.ai_prompt.$error"
-        required
-        class="margin-bottom-2"
-      >
-        <InjectedFormulaInput
-          v-model="values.ai_prompt"
-          :placeholder="$t('aiAgentServiceForm.promptPlaceholder')"
+        <Button
+          type="secondary"
+          icon="iconoir-bin"
+          @click="removeChoice(index)"
         />
-        <template #error>
-          <span v-if="!v$.values.ai_prompt.required" class="error">
-            {{ $t('error.requiredField') }}
-          </span>
-        </template>
-      </FormGroup>
+      </div>
+      <Button type="secondary" size="small" @click="addChoice">
+        <i class="iconoir-plus"></i>
+        {{ $t('aiAgentServiceForm.addChoice') }}
+      </Button>
+      <template #error>
+        <span v-if="!v$.values.ai_choices.hasValidChoice" class="error">
+          {{ $t('aiAgentServiceForm.choicesRequired') }}
+        </span>
+      </template>
+    </FormGroup>
 
-      <FormGroup
-        v-if="values.ai_output_type === 'choice'"
-        small-label
-        :label="$t('aiAgentServiceForm.choicesLabel')"
-        :error="v$.values.ai_choices.$error"
-        required
-        class="margin-bottom-2"
-      >
-        <div
-          v-for="(choice, index) in values.ai_choices"
-          :key="index"
-          class="margin-bottom-1 flex"
-        >
-          <FormInput
-            :value="choice"
-            :placeholder="$t('aiAgentServiceForm.choicePlaceholder')"
-            class="flex-1 margin-right-1"
-            @input="updateChoice(index, $event)"
-          />
-          <Button
-            type="secondary"
-            icon="iconoir-bin"
-            @click="removeChoice(index)"
-          />
-        </div>
-        <Button type="secondary" size="small" @click="addChoice">
-          <i class="iconoir-plus"></i>
-          {{ $t('aiAgentServiceForm.addChoice') }}
-        </Button>
-        <template #error>
-          <span v-if="!v$.values.ai_choices.hasValidChoice" class="error">
-            {{ $t('aiAgentServiceForm.choicesRequired') }}
-          </span>
-        </template>
-      </FormGroup>
-    </template>
+    <FormGroup
+      small-label
+      :label="$t('aiAgentServiceForm.temperatureLabel')"
+      class="margin-bottom-2"
+    >
+      <FormInput
+        v-model.number="values.ai_temperature"
+        type="number"
+        :min="0"
+        :max="maxTemperature"
+        :step="0.1"
+        :placeholder="$t('aiAgentServiceForm.temperaturePlaceholder')"
+      />
+      <template #helper>
+        {{ $t('aiAgentServiceForm.temperatureHelp') }}
+      </template>
+    </FormGroup>
   </form>
 </template>
 
diff --git a/web-frontend/modules/integrations/ai/integrationTypes.js b/web-frontend/modules/integrations/ai/integrationTypes.js
index 8b6e0a67b2..e55ba7d7c5 100644
--- a/web-frontend/modules/integrations/ai/integrationTypes.js
+++ b/web-frontend/modules/integrations/ai/integrationTypes.js
@@ -10,6 +10,10 @@ export class AIIntegrationType extends IntegrationType {
     return this.app.i18n.t('integrationType.ai')
   }
 
+  get iconClass() {
+    return 'iconoir-spark'
+  }
+
   getSummary(integration) {
     const aiSettings = integration.ai_settings || {}
     const overrideCount = Object.keys(aiSettings).length
@@ -18,9 +22,10 @@ export class AIIntegrationType extends IntegrationType {
       return this.app.i18n.t('aiIntegrationType.inheritingWorkspace')
     }
 
-    return this.app.i18n.t('aiIntegrationType.overridingProviders', {
-      count: overrideCount,
-    })
+    return this.app.i18n.tc(
+      'aiIntegrationType.overridingProviders',
+      overrideCount
+    )
   }
 
   get formComponent() {
diff --git a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue
index fcae94cbfb..47a14bbade 100644
--- a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue
+++ b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue
@@ -9,7 +9,6 @@
     >
       <IntegrationDropdown
         v-model="values.integration_id"
-        auto-select-first
         :application="application"
         :integrations="integrations"
         :integration-type="integrationType"
diff --git a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowTableServiceConditionalForm.vue b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowTableServiceConditionalForm.vue
index 26976a9a86..2823335cc2 100644
--- a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowTableServiceConditionalForm.vue
+++ b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowTableServiceConditionalForm.vue
@@ -39,7 +39,12 @@
               'localBaserowTableServiceConditionalForm.formulaFilterInputPlaceholder'
             )
           "
-          @input="updateFilter({ filter, values: { value: $event.formula } })"
+          @input="
+            updateFilter({
+              filter,
+              values: { value: $event.formula, mode: $event.mode },
+            })
+          "
         />
       </template>
       <template
@@ -173,7 +178,7 @@ export default {
             id: uuidv1(),
             field: field.id,
             type: 'equal',
-            value: { formula: '' },
+            value: { formula: '', mode: 'raw' },
             value_is_formula: false,
           })
           this.$emit('input', newFilters)
@@ -198,10 +203,14 @@ export default {
       const newFilters = this.value.map((filterConf) => {
         if (filterConf.id === filter.id) {
           // Convert the formula value string into our Baserow formula object.
+          const { value_is_formula: valueIsFormula } = { ...filter, ...values }
           return {
             ...filterConf,
             ...values,
-            value: { formula: values.value, mode: 'simple' },
+            value: {
+              formula: values.value,
+              mode: valueIsFormula ? values.mode || 'simple' : 'raw',
+            },
           }
         }
         return filterConf
@@ -222,9 +231,12 @@ export default {
       } else if (filter.value) {
         newValue = `'${filter.value}'`
       }
-      emitUpdate({
-        value: newValue,
-        value_is_formula: !filter.value_is_formula,
+      this.updateFilter({
+        filter,
+        values: {
+          value: newValue,
+          value_is_formula: !filter.value_is_formula,
+        },
       })
     },
     /*
@@ -252,7 +264,12 @@ export default {
      */
     getFormulaObject(filter) {
       const originalFilter = this.value.find((f) => f.id === filter.id)
-      return originalFilter.value
+      return {
+        ...originalFilter.value,
+        mode: originalFilter.value_is_formula
+          ? originalFilter.value.mode || 'simple'
+          : 'raw',
+      }
     },
   },
 }
diff --git a/web-frontend/modules/integrations/locales/en.json b/web-frontend/modules/integrations/locales/en.json
index 10b00e0dc2..01e48a673c 100644
--- a/web-frontend/modules/integrations/locales/en.json
+++ b/web-frontend/modules/integrations/locales/en.json
@@ -15,7 +15,7 @@
   },
   "aiIntegrationType": {
     "inheritingWorkspace": "Inheriting workspace AI settings",
-    "overridingProviders": "Overriding {count} provider | Overriding {count} providers"
+    "overridingProviders": "Overriding {count} provider|Overriding {count} providers"
   },
   "serviceType": {
     "localBaserowGetRow": "Get single row",
@@ -63,7 +63,7 @@
     "corePeriodicDescription": "Triggers the workflow on a periodic basis at specified intervals",
     "corePeriodicErrorIntervalMissing": "An interval is required.",
     "errorIterationSourceMissing": "Missing source property",
-    "aiAgent": "AI Agent",
+    "aiAgent": "AI prompt",
     "aiAgentDescription": "Execute AI prompts using configured generative AI models.",
     "errorNoIntegrationSelected": "No integration selected",
     "errorNoAIProviderSelected": "No AI provider selected",
@@ -87,13 +87,13 @@
     "overridden": "Overridden"
   },
   "aiAgentServiceForm": {
-    "integrationLabel": "AI Integration",
+    "integrationLabel": "Integration",
     "providerLabel": "AI Provider",
     "providerPlaceholder": "Select an AI provider...",
     "modelLabel": "AI Model",
     "modelPlaceholder": "Select a model...",
     "outputTypeLabel": "Output Type",
-    "outputTypeHelp": "Choose how the AI should format its response.",
+    "outputTypeHelp": "Choose how the AI should format its response. If you define choices, you force the model to respond only with one of those choices.",
     "outputTypeText": "Text",
     "outputTypeChoice": "Choice",
     "temperatureLabel": "Temperature",

From 0e1f6772159e7e1c2792ca09e94144102e4b09c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Pardou?=
 <571533+jrmi@users.noreply.github.com>
Date: Mon, 10 Nov 2025 16:10:15 +0100
Subject: [PATCH 3/6] Fix form data scoping issue (#4186)

---
 ...e_with_form_input_and_repeat_elements.json |  8 ++++
 .../components/FormContainerElement.vue       | 27 ++++++-------
 .../collectionField/ButtonField.vue           |  9 ++---
 .../modules/builder/dataProviderTypes.js      | 10 ++++-
 web-frontend/modules/builder/elementTypes.js  | 38 +++++++++++++------
 web-frontend/modules/builder/eventTypes.js    |  7 +++-
 .../modules/builder/mixins/element.js         |  9 ++---
 .../modules/builder/mixins/formElement.js     |  8 ++--
 .../elements/components/ChoiceElement.spec.js |  7 +++-
 .../components/DateTimePickerElement.spec.js  |  1 +
 .../components/RecordSelectorElement.spec.js  |  2 +
 11 files changed, 80 insertions(+), 46 deletions(-)
 create mode 100644 changelog/entries/unreleased/bug/4185_fix_scope_issue_with_form_input_and_repeat_elements.json

diff --git a/changelog/entries/unreleased/bug/4185_fix_scope_issue_with_form_input_and_repeat_elements.json b/changelog/entries/unreleased/bug/4185_fix_scope_issue_with_form_input_and_repeat_elements.json
new file mode 100644
index 0000000000..b30730534f
--- /dev/null
+++ b/changelog/entries/unreleased/bug/4185_fix_scope_issue_with_form_input_and_repeat_elements.json
@@ -0,0 +1,8 @@
+{
+    "type": "bug",
+    "message": "Fix scope issue with form input and repeat elements",
+    "domain": "builder",
+    "issue_number": 4185,
+    "bullet_points": [],
+    "created_at": "2025-11-08"
+}
\ No newline at end of file
diff --git a/web-frontend/modules/builder/components/elements/components/FormContainerElement.vue b/web-frontend/modules/builder/components/elements/components/FormContainerElement.vue
index 9f7761347a..1bb837d996 100644
--- a/web-frontend/modules/builder/components/elements/components/FormContainerElement.vue
+++ b/web-frontend/modules/builder/components/elements/components/FormContainerElement.vue
@@ -94,13 +94,12 @@ export default {
      * value is invalid.
      */
     formElementChildrenAreInvalid() {
-      const { recordIndexPath } = this.applicationContext
       return this.getFormElementDescendants.some(
         ({ descendant, descendantType }) => {
-          const uniqueElementId = descendantType.uniqueElementId(
-            descendant,
-            recordIndexPath
-          )
+          const uniqueElementId = descendantType.uniqueElementId({
+            element: descendant,
+            applicationContext: this.applicationContext,
+          })
           return this.$store.getters['formData/getElementInvalid'](
             this.elementPage,
             uniqueElementId
@@ -115,13 +114,12 @@ export default {
      * as touched, or not touched, depending on what we're achieving in validation.
      */
     setFormElementDescendantsTouched(wasTouched) {
-      const { recordIndexPath } = this.applicationContext
       this.getFormElementDescendants.forEach(
         ({ descendant, descendantType }) => {
-          const uniqueElementId = descendantType.uniqueElementId(
-            descendant,
-            recordIndexPath
-          )
+          const uniqueElementId = descendantType.uniqueElementId({
+            element: descendant,
+            applicationContext: this.applicationContext,
+          })
           this.$store.dispatch('formData/setElementTouched', {
             page: this.elementPage,
             wasTouched,
@@ -137,14 +135,13 @@ export default {
      * be left intact.
      */
     resetFormContainerElements() {
-      const { recordIndexPath } = this.applicationContext
       if (this.element.reset_initial_values_post_submission) {
         this.getFormElementDescendants.forEach(
           ({ descendant, descendantType }) => {
-            const uniqueElementId = descendantType.uniqueElementId(
-              descendant,
-              recordIndexPath
-            )
+            const uniqueElementId = descendantType.uniqueElementId({
+              element: descendant,
+              applicationContext: this.applicationContext,
+            })
             const initialValue = descendantType.getInitialFormDataValue(
               descendant,
               this.applicationContext
diff --git a/web-frontend/modules/builder/components/elements/components/collectionField/ButtonField.vue b/web-frontend/modules/builder/components/elements/components/collectionField/ButtonField.vue
index 3d05694b0a..15cc4eeac6 100644
--- a/web-frontend/modules/builder/components/elements/components/collectionField/ButtonField.vue
+++ b/web-frontend/modules/builder/components/elements/components/collectionField/ButtonField.vue
@@ -24,11 +24,10 @@ export default {
       return `${this.field.uid}_click`
     },
     workflowActionsInProgress() {
-      const { recordIndexPath } = this.applicationContext
-      const dispatchedById = this.elementType.uniqueElementId(
-        this.element,
-        recordIndexPath
-      )
+      const dispatchedById = this.elementType.uniqueElementId({
+        element: this.element,
+        applicationContext: this.applicationContext,
+      })
       const workflowActions = this.$store.getters[
         'builderWorkflowAction/getElementWorkflowActions'
       ](this.elementPage, this.element.id)
diff --git a/web-frontend/modules/builder/dataProviderTypes.js b/web-frontend/modules/builder/dataProviderTypes.js
index 13341f973a..599e4d915e 100644
--- a/web-frontend/modules/builder/dataProviderTypes.js
+++ b/web-frontend/modules/builder/dataProviderTypes.js
@@ -721,10 +721,12 @@ export class FormDataProviderType extends DataProviderType {
    */
   formElementsInNamespacePath(applicationContext, targetElement) {
     const { page } = applicationContext
+
     const targetNamespacePath =
       this.app.store.getters['element/getElementNamespacePath'](
         targetElement
       ).join('.')
+
     const elements = this.app.store.getters['element/getElementsOrdered'](page)
     return elements.filter((element) => {
       const elementType = this.app.$registry.get('element', element.type)
@@ -736,6 +738,7 @@ export class FormDataProviderType extends DataProviderType {
         this.app.store.getters['element/getElementNamespacePath'](element).join(
           '.'
         )
+
       return targetNamespacePath.startsWith(elementNamespacePath)
     })
   }
@@ -746,19 +749,22 @@ export class FormDataProviderType extends DataProviderType {
   }
 
   getDataContent(applicationContext) {
+    const { element: targetElement } = applicationContext
     const formData = this.app.store.getters['formData/getFormData'](
       applicationContext.page
     )
-    const { element: targetElement, recordIndexPath } = applicationContext
+
     const accessibleFormElements = this.formElementsInNamespacePath(
       applicationContext,
       targetElement
     )
+
     return Object.fromEntries(
       accessibleFormElements.map((element) => {
         const uniqueElementId = this.app.$registry
           .get('element', element.type)
-          .uniqueElementId(element, recordIndexPath)
+          .uniqueElementId({ element, applicationContext })
+
         const formEntry = getValueAtPath(formData, uniqueElementId)
         return [element.id, formEntry?.value]
       })
diff --git a/web-frontend/modules/builder/elementTypes.js b/web-frontend/modules/builder/elementTypes.js
index dabc7121f8..dedcc79785 100644
--- a/web-frontend/modules/builder/elementTypes.js
+++ b/web-frontend/modules/builder/elementTypes.js
@@ -394,17 +394,11 @@ export class ElementType extends Registerable {
    * @param {Object} page - The page the element belongs to.
    */
   getElementNamespacePath(element, page) {
-    const ancestors = this.app.store.getters['element/getAncestors'](
+    return this.getCollectionAncestry({
       page,
-      element
-    )
-    return ancestors
-      .map((ancestor) => {
-        const elementType = this.app.$registry.get('element', ancestor.type)
-        return elementType.isCollectionElement ? ancestor.id : null
-      })
-      .filter((id) => id !== null)
-      .reverse()
+      element,
+      allowSameElement: false,
+    }).map(({ id }) => id)
   }
 
   /**
@@ -738,8 +732,28 @@ export class ElementType extends Registerable {
    * @returns {String} - The unique element ID.
    *
    */
-  uniqueElementId(element, recordIndexPath) {
-    return [element.id, ...(recordIndexPath || [])].join('.')
+  uniqueElementId({ element, applicationContext }) {
+    const { recordIndexPath, builder, page } = applicationContext
+
+    const elementPage =
+      element.page_id === page.id
+        ? page
+        : this.app.store.getters['page/getById'](builder, element.page_id)
+
+    const collectionAncestorLength = this.getCollectionAncestry({
+      page: elementPage,
+      element,
+      allowSameElement: false,
+    }).length
+
+    // We might be asking the uniqueID for an outside element so we don't
+    // want to consume the whole record path
+    const recordIndexPathForThisElement = (recordIndexPath || []).slice(
+      0,
+      collectionAncestorLength
+    )
+
+    return [element.id, ...recordIndexPathForThisElement].join('.')
   }
 
   /**
diff --git a/web-frontend/modules/builder/eventTypes.js b/web-frontend/modules/builder/eventTypes.js
index 71b98000f5..3dca4885f7 100644
--- a/web-frontend/modules/builder/eventTypes.js
+++ b/web-frontend/modules/builder/eventTypes.js
@@ -19,10 +19,13 @@ export class Event {
 
   async fire({ workflowActions, applicationContext }) {
     const additionalContext = {}
-    const { element, recordIndexPath, builder, page } = applicationContext
+    const { element, builder, page } = applicationContext
     const pages = [page, this.app.store.getters['page/getSharedPage'](builder)]
     const elementType = this.app.$registry.get('element', element.type)
-    const dispatchedById = elementType.uniqueElementId(element, recordIndexPath)
+    const dispatchedById = elementType.uniqueElementId({
+      element,
+      applicationContext,
+    })
 
     /**
      * The currentDispatchId is used to keep track of chained Workflow Actions.
diff --git a/web-frontend/modules/builder/mixins/element.js b/web-frontend/modules/builder/mixins/element.js
index 2d3e201208..a75a8e722f 100644
--- a/web-frontend/modules/builder/mixins/element.js
+++ b/web-frontend/modules/builder/mixins/element.js
@@ -18,11 +18,10 @@ export default {
       const workflowActions = this.$store.getters[
         'builderWorkflowAction/getElementWorkflowActions'
       ](this.elementPage, this.element.id)
-      const { recordIndexPath } = this.applicationContext
-      const dispatchedById = this.elementType.uniqueElementId(
-        this.element,
-        recordIndexPath
-      )
+      const dispatchedById = this.elementType.uniqueElementId({
+        element: this.element,
+        applicationContext: this.applicationContext,
+      })
       return workflowActions.some((workflowAction) =>
         this.$store.getters['builderWorkflowAction/getDispatching'](
           workflowAction,
diff --git a/web-frontend/modules/builder/mixins/formElement.js b/web-frontend/modules/builder/mixins/formElement.js
index 290b2356f4..21c9a4f6ce 100644
--- a/web-frontend/modules/builder/mixins/formElement.js
+++ b/web-frontend/modules/builder/mixins/formElement.js
@@ -22,10 +22,10 @@ export default {
   },
   computed: {
     uniqueElementId() {
-      return this.elementType.uniqueElementId(
-        this.element,
-        this.applicationContext.recordIndexPath
-      )
+      return this.elementType.uniqueElementId({
+        element: this.element,
+        applicationContext: this.applicationContext,
+      })
     },
     formElementData() {
       return this.$store.getters['formData/getElementFormEntry'](
diff --git a/web-frontend/test/unit/builder/components/elements/components/ChoiceElement.spec.js b/web-frontend/test/unit/builder/components/elements/components/ChoiceElement.spec.js
index 4e34dc2b51..0a57e2117a 100644
--- a/web-frontend/test/unit/builder/components/elements/components/ChoiceElement.spec.js
+++ b/web-frontend/test/unit/builder/components/elements/components/ChoiceElement.spec.js
@@ -23,8 +23,8 @@ describe('ChoiceElement', () => {
   }
 
   const mountComponentForElement = async (element) => {
-    const builder = { id: 1, theme: { primary_color: '#ccc' } }
     const page = { id: 1, elements: [] }
+    const builder = { id: 1, theme: { primary_color: '#ccc' }, pages: [page] }
     const workspace = {}
     const mode = 'public'
     const applicationContext = { builder, page, mode }
@@ -74,6 +74,7 @@ describe('ChoiceElement', () => {
       option_type: 'manual',
       show_as_dropdown: true,
       options: [],
+      page_id: 1,
     })
 
     expect(wrapper.element).toMatchSnapshot()
@@ -92,6 +93,7 @@ describe('ChoiceElement', () => {
         { value: '1', name: 'First' },
         { value: '2', name: 'Second' },
       ],
+      page_id: 1,
     })
 
     expect(wrapper.element).toMatchSnapshot()
@@ -111,6 +113,7 @@ describe('ChoiceElement', () => {
         { value: 'bar_name', name: 'Bar Name' },
         { value: null, name: 'Baz Name' },
       ],
+      page_id: 1,
     })
 
     expect(wrapper.vm.optionsResolved).toEqual([
@@ -136,6 +139,7 @@ describe('ChoiceElement', () => {
         { value: '1', name: 'First' },
         { value: '2', name: 'Second' },
       ],
+      page_id: 1,
     })
 
     expect(wrapper.element).toMatchSnapshot()
@@ -154,6 +158,7 @@ describe('ChoiceElement', () => {
         { value: '1', name: 'First' },
         { value: '2', name: 'Second' },
       ],
+      page_id: 1,
     })
 
     expect(wrapper.element).toMatchSnapshot()
diff --git a/web-frontend/test/unit/builder/components/elements/components/DateTimePickerElement.spec.js b/web-frontend/test/unit/builder/components/elements/components/DateTimePickerElement.spec.js
index dd1cdd9a6e..3be7a0f2f8 100644
--- a/web-frontend/test/unit/builder/components/elements/components/DateTimePickerElement.spec.js
+++ b/web-frontend/test/unit/builder/components/elements/components/DateTimePickerElement.spec.js
@@ -76,6 +76,7 @@ describe('DateTimePickerElement', () => {
       date_format: format.date.name,
       include_time: !!format.time,
       time_format: format.time ? format.time.name : '24',
+      page_id: page.id,
     }
     store.dispatch('element/forceCreate', { page, element })
 
diff --git a/web-frontend/test/unit/builder/components/elements/components/RecordSelectorElement.spec.js b/web-frontend/test/unit/builder/components/elements/components/RecordSelectorElement.spec.js
index a9eced7289..a4b3091983 100644
--- a/web-frontend/test/unit/builder/components/elements/components/RecordSelectorElement.spec.js
+++ b/web-frontend/test/unit/builder/components/elements/components/RecordSelectorElement.spec.js
@@ -77,6 +77,7 @@ describe('RecordSelectorElement', () => {
       type: 'record_selector',
       data_source_id: page.dataSources[0].id,
       items_per_page: 5,
+      page_id: page.id,
     }
     store.dispatch('element/forceCreate', { page, element })
 
@@ -190,6 +191,7 @@ describe('RecordSelectorElement', () => {
       data_source_id: page.dataSources[0].id,
       items_per_page: 5,
       option_name_suffix: { formula: "'Suffix'", mode: 'simple' },
+      page_id: page.id,
     }
     store.dispatch('element/forceCreate', { page, element })
 

From 7c9c83673a2cdcfa8573764ef18e11fc7e32ced7 Mon Sep 17 00:00:00 2001
From: Peter Evans <peter@baserow.io>
Date: Mon, 10 Nov 2025 15:17:11 +0000
Subject: [PATCH 4/6] Tweak the periodic service's minute interval; impose
 minimum values depending on the env. (#4173)

* Allow users to choose, when the interval is minute, how many minutes can pass between intervals. A value of 15 means every 15 minutes since the last periodic run. I'm using this opportunity to also set minimum limits. Self-hosters can run every minute, but in SaaS it will be a higher value.

* The second/microsecond reset needs to happen at the beginning.

* Lint fixes

* Fix tests; add backend validation to ensure interval=minute minute values are >=settings.INTEGRATIONS_PERIODIC_MINUTE_MIN
---
 .env.example                                  |  1 +
 backend/src/baserow/config/settings/base.py   |  5 ++
 .../integrations/core/service_types.py        | 58 +++++++++++++-
 .../core/test_core_periodic_service_type.py   | 79 ++++++++++++++++---
 docker-compose.local-build.yml                |  1 +
 docker-compose.no-caddy.yml                   |  1 +
 docker-compose.yml                            |  1 +
 web-frontend/modules/automation/nodeTypes.js  |  4 +-
 web-frontend/modules/core/module.js           |  2 +
 .../services/CorePeriodicServiceForm.vue      | 68 ++++++++++++----
 .../modules/integrations/locales/en.json      |  7 +-
 11 files changed, 192 insertions(+), 35 deletions(-)

diff --git a/.env.example b/.env.example
index efeb4cc3f7..391f0c463d 100644
--- a/.env.example
+++ b/.env.example
@@ -100,6 +100,7 @@ DATABASE_NAME=baserow
 # BASEROW_WEBHOOK_ROWS_ENTER_VIEW_BATCH_SIZE=
 
 # BASEROW_INTEGRATIONS_ALLOW_PRIVATE_ADDRESS=
+# BASEROW_INTEGRATIONS_PERIODIC_MINUTE_MIN=
 
 # BASEROW_AIRTABLE_IMPORT_SOFT_TIME_LIMIT=
 # HOURS_UNTIL_TRASH_PERMANENTLY_DELETED=
diff --git a/backend/src/baserow/config/settings/base.py b/backend/src/baserow/config/settings/base.py
index 5efa0f0fb1..f4772cc52a 100644
--- a/backend/src/baserow/config/settings/base.py
+++ b/backend/src/baserow/config/settings/base.py
@@ -1046,6 +1046,11 @@ def __setitem__(self, key, value):
     os.getenv("BASEROW_INTEGRATIONS_ALLOW_PRIVATE_ADDRESS", False)
 )
 INTEGRATIONS_PERIODIC_TASK_CRONTAB = crontab(minute="*")
+# The minimum amount of minutes the periodic task's "minute" interval
+# supports. Self-hosters can run every minute, if they choose to.
+INTEGRATIONS_PERIODIC_MINUTE_MIN = int(
+    os.getenv("BASEROW_INTEGRATIONS_PERIODIC_MINUTE_MIN", 1)
+)
 
 TOTP_ISSUER_NAME = os.getenv("BASEROW_TOTP_ISSUER_NAME", "Baserow")
 
diff --git a/backend/src/baserow/contrib/integrations/core/service_types.py b/backend/src/baserow/contrib/integrations/core/service_types.py
index a8342c1d57..656601d10d 100644
--- a/backend/src/baserow/contrib/integrations/core/service_types.py
+++ b/backend/src/baserow/contrib/integrations/core/service_types.py
@@ -6,9 +6,11 @@
 from typing import Any, Callable, Dict, Generator, List, Optional, Tuple
 
 from django.conf import settings
+from django.contrib.auth.models import AbstractUser
 from django.core.mail import EmailMultiAlternatives, get_connection
 from django.db import router
-from django.db.models import Q
+from django.db.models import DurationField, ExpressionWrapper, F, Q, Value
+from django.db.models.functions import Coalesce, NullIf
 from django.urls import path
 from django.utils import timezone
 from django.utils.translation import gettext as _
@@ -21,6 +23,9 @@
 from rest_framework import serializers
 
 from baserow.config.celery import app as celery_app
+from baserow.contrib.automation.nodes.exceptions import (
+    AutomationNodeMisconfiguredService,
+)
 from baserow.contrib.integrations.core.api.webhooks.views import CoreHTTPTriggerView
 from baserow.contrib.integrations.core.constants import (
     BODY_TYPE,
@@ -1232,6 +1237,33 @@ class SerializedDict(ServiceDict):
         day_of_week: int
         day_of_month: int
 
+    def prepare_values(
+        self,
+        values: Dict[str, Any],
+        user: AbstractUser,
+        instance: Optional[CorePeriodicService] = None,
+    ) -> Dict[str, Any]:
+        """
+        Responsible for preparing and validating the periodic service values.
+        If the `interval` is set to `MINUTE`, it ensures that the `minute` value
+        is greater than or equal to the minimum allowed value defined in the settings.
+
+        :param values: The values to prepare.
+        :param user: The user creating or updating the service.
+        :param instance: The existing service instance, if updating.
+        :return: The prepared values.
+        """
+
+        minute = values.get("minute", None)
+        if values.get("interval") == PERIODIC_INTERVAL_MINUTE and minute is not None:
+            if minute < settings.INTEGRATIONS_PERIODIC_MINUTE_MIN:
+                raise AutomationNodeMisconfiguredService(
+                    "The `minute` value must be greater "
+                    f"or equal to {settings.INTEGRATIONS_PERIODIC_MINUTE_MIN}."
+                )
+
+        return super().prepare_values(values, user, instance)
+
     def can_immediately_be_tested(self, service):
         return True
 
@@ -1297,13 +1329,33 @@ def call_periodic_services_that_are_due(self, now: datetime):
         :param now: The current datetime.
         """
 
+        # Truncate to minute precision for consistent interval calculations
+        # Note: we replace the seconds and microseconds due to jitter that
+        # can exist between when the Celery task is scheduled, and when the
+        # services were actually processed. For example:
+        #
+        # Assuming `interval=minute` and `minute=2` (i.e. run every two minutes):
+        # - Celery runs at 12:00:00.500 (half a second delay)
+        # - Service is triggered, last_periodic_run = 12:00:00.500
+        # Next checks:
+        #   - At 12:01:00.400: Is 12:00:00.500 <= 11:59:00.400? NO
+        #   - At 12:02:00.300: Is 12:00:00.500 <= 12:00:00.300? NO (500ms > 300ms!)
+        #   - At 12:03:00.200: Is 12:00:00.500 <= 12:01:00.200? YES
+        now = now.replace(second=0, microsecond=0)
+
         query_conditions = Q()
         is_null = Q(last_periodic_run__isnull=True)
 
         # MINUTE
-        minute_ago = now - timedelta(minutes=1)
         minute_condition = Q(
-            is_null | Q(last_periodic_run__lt=minute_ago),
+            is_null
+            | Q(
+                last_periodic_run__lte=now
+                - ExpressionWrapper(
+                    Coalesce(NullIf(F("minute"), 0), Value(1)) * timedelta(minutes=1),
+                    output_field=DurationField(),
+                )
+            ),
             interval=PERIODIC_INTERVAL_MINUTE,
         )
         query_conditions |= minute_condition
diff --git a/backend/tests/baserow/contrib/integrations/core/test_core_periodic_service_type.py b/backend/tests/baserow/contrib/integrations/core/test_core_periodic_service_type.py
index 1f2631c09b..14d54d9159 100644
--- a/backend/tests/baserow/contrib/integrations/core/test_core_periodic_service_type.py
+++ b/backend/tests/baserow/contrib/integrations/core/test_core_periodic_service_type.py
@@ -8,6 +8,9 @@
 from freezegun import freeze_time
 from pytest_unordered import unordered
 
+from baserow.contrib.automation.nodes.exceptions import (
+    AutomationNodeMisconfiguredService,
+)
 from baserow.contrib.automation.nodes.handler import AutomationNodeHandler
 from baserow.contrib.automation.nodes.node_types import CorePeriodicTriggerNodeType
 from baserow.contrib.automation.nodes.registries import automation_node_type_registry
@@ -97,6 +100,38 @@ def test_periodic_trigger_node_creation_and_property_updates(data_fixture):
     assert updated_service_specific.day_of_week == 2
 
 
+@pytest.mark.django_db
+@patch(
+    "baserow.contrib.integrations.core.service_types.settings.INTEGRATIONS_PERIODIC_MINUTE_MIN",
+    5,
+)
+def test_periodic_service_prepare_values_validates_minute_minimum(data_fixture):
+    user = data_fixture.create_user()
+    values = {
+        "interval": PERIODIC_INTERVAL_MINUTE,
+        "minute": 5,
+    }
+    prepared = CorePeriodicServiceType().prepare_values(values, user)
+    assert prepared["interval"] == PERIODIC_INTERVAL_MINUTE
+    assert prepared["minute"] == 5
+
+    values = {
+        "interval": PERIODIC_INTERVAL_MINUTE,
+        "minute": 10,
+    }
+    prepared = CorePeriodicServiceType().prepare_values(values, user)
+    assert prepared["interval"] == PERIODIC_INTERVAL_MINUTE
+    assert prepared["minute"] == 10
+
+    values = {
+        "interval": PERIODIC_INTERVAL_MINUTE,
+        "minute": 3,
+    }
+    with pytest.raises(AutomationNodeMisconfiguredService) as e:
+        CorePeriodicServiceType().prepare_values(values, user)
+    assert str(e.value) == "The `minute` value must be greater or equal to 5."
+
+
 @pytest.mark.django_db(transaction=True)
 @patch(
     "baserow.contrib.automation.workflows.handler.AutomationWorkflowHandler.start_workflow"
@@ -225,11 +260,11 @@ def test_call_multiple_periodic_services_that_are_due(
         [
             call(
                 workflow_1,
-                {"triggered_at": "2025-02-15T10:30:45+00:00"},
+                {"triggered_at": "2025-02-15T10:30:00+00:00"},
             ),
             call(
                 workflow_2,
-                {"triggered_at": "2025-02-15T10:30:45+00:00"},
+                {"triggered_at": "2025-02-15T10:30:00+00:00"},
             ),
         ]
     )
@@ -251,6 +286,7 @@ def test_call_multiple_periodic_services_that_are_due(
         ),
         (
             {
+                # Compat: no `minute` is provided, so it defaults to "1" (every minute).
                 "interval": PERIODIC_INTERVAL_MINUTE,
                 "last_periodic_run": datetime(
                     2025, 2, 15, 10, 30, 30, tzinfo=timezone.utc
@@ -263,6 +299,7 @@ def test_call_multiple_periodic_services_that_are_due(
         ),
         (
             {
+                # Compat: no `minute` is provided, so it defaults to "1" (every minute).
                 "interval": PERIODIC_INTERVAL_MINUTE,
                 "last_periodic_run": datetime(
                     2025, 2, 15, 10, 30, 0, tzinfo=timezone.utc
@@ -275,37 +312,51 @@ def test_call_multiple_periodic_services_that_are_due(
         ),
         (
             {
+                # Compat: no `minute` is provided, so it defaults to "1" (every minute).
                 "interval": PERIODIC_INTERVAL_MINUTE,
                 "last_periodic_run": datetime(
-                    2025, 2, 15, 10, 29, 59, tzinfo=timezone.utc
+                    2025, 2, 15, 10, 28, 59, tzinfo=timezone.utc
                 ),
             },
             "2025-02-15 10:30:45",
-            # 2025-02-15 10:30:45 - 2025-2-15-10 29:59 = 46 seconds, so should not be
-            # triggered.
-            False,
+            # 2025-02-15 10:30:45 - 2025-2-15-10 28:59 = 1 minute 46 seconds, so should
+            # be triggered.
+            True,
         ),
         (
             {
+                # Compat: no `minute` is provided, so it defaults to "1" (every minute).
                 "interval": PERIODIC_INTERVAL_MINUTE,
                 "last_periodic_run": datetime(
-                    2025, 2, 15, 10, 28, 59, tzinfo=timezone.utc
+                    2025, 1, 16, 2, 59, 59, tzinfo=timezone.utc
                 ),
             },
             "2025-02-15 10:30:45",
-            # 2025-02-15 10:30:45 - 2025-2-15-10 28:59 = 1 minute 46 seconds, so should
-            # be triggered.
+            # Almost a month ago, so it should be triggered.
             True,
         ),
         (
             {
+                "minute": 5,
                 "interval": PERIODIC_INTERVAL_MINUTE,
                 "last_periodic_run": datetime(
-                    2025, 1, 16, 2, 59, 59, tzinfo=timezone.utc
+                    2025, 11, 6, 12, 0, 0, tzinfo=timezone.utc
                 ),
             },
-            "2025-02-15 10:30:45",
-            # Almost a month ago, so it should be triggered.
+            "2025-11-06 12:03:00",
+            # It's been 3 minutes, so it should not be triggered.
+            False,
+        ),
+        (
+            {
+                "minute": 5,
+                "interval": PERIODIC_INTERVAL_MINUTE,
+                "last_periodic_run": datetime(
+                    2025, 11, 6, 12, 0, 0, tzinfo=timezone.utc
+                ),
+            },
+            "2025-11-06 12:05:00",
+            # It's been 5 minutes, so it should be triggered.
             True,
         ),
         # Hour
@@ -609,7 +660,9 @@ def test_call_periodic_services_that_are_due(
     service_type = service_type_registry.get(CorePeriodicServiceType.type)
     service_type.on_event = MagicMock()
 
-    target_date = datetime.fromisoformat(frozen_time).replace(tzinfo=timezone.utc)
+    target_date = datetime.fromisoformat(frozen_time).replace(
+        tzinfo=timezone.utc, second=0, microsecond=0
+    )
 
     def check_service_count(services, event_payload):
         if should_be_called:
diff --git a/docker-compose.local-build.yml b/docker-compose.local-build.yml
index bf603ff8ae..08c1325cb4 100644
--- a/docker-compose.local-build.yml
+++ b/docker-compose.local-build.yml
@@ -129,6 +129,7 @@ x-backend-variables:
   BASEROW_WEBHOOKS_MAX_CALL_LOG_ENTRIES:
   BASEROW_WEBHOOKS_REQUEST_TIMEOUT_SECONDS:
   BASEROW_INTEGRATIONS_ALLOW_PRIVATE_ADDRESS:
+  BASEROW_INTEGRATIONS_PERIODIC_MINUTE_MIN:
   BASEROW_ENTERPRISE_AUDIT_LOG_CLEANUP_INTERVAL_MINUTES:
   BASEROW_ENTERPRISE_AUDIT_LOG_RETENTION_DAYS:
   BASEROW_ALLOW_MULTIPLE_SSO_PROVIDERS_FOR_SAME_ACCOUNT:
diff --git a/docker-compose.no-caddy.yml b/docker-compose.no-caddy.yml
index 4c694cd1a2..85a8bdda70 100644
--- a/docker-compose.no-caddy.yml
+++ b/docker-compose.no-caddy.yml
@@ -148,6 +148,7 @@ x-backend-variables:
   BASEROW_WEBHOOKS_MAX_CALL_LOG_ENTRIES:
   BASEROW_WEBHOOKS_REQUEST_TIMEOUT_SECONDS:
   BASEROW_INTEGRATIONS_ALLOW_PRIVATE_ADDRESS:
+  BASEROW_INTEGRATIONS_PERIODIC_MINUTE_MIN:
   BASEROW_ENTERPRISE_AUDIT_LOG_CLEANUP_INTERVAL_MINUTES:
   BASEROW_ENTERPRISE_AUDIT_LOG_RETENTION_DAYS:
   BASEROW_ALLOW_MULTIPLE_SSO_PROVIDERS_FOR_SAME_ACCOUNT:
diff --git a/docker-compose.yml b/docker-compose.yml
index f8e122c19f..2006a8d005 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -164,6 +164,7 @@ x-backend-variables:
   BASEROW_WEBHOOKS_MAX_CALL_LOG_ENTRIES:
   BASEROW_WEBHOOKS_REQUEST_TIMEOUT_SECONDS:
   BASEROW_INTEGRATIONS_ALLOW_PRIVATE_ADDRESS:
+  BASEROW_INTEGRATIONS_PERIODIC_MINUTE_MIN:
   BASEROW_ENTERPRISE_AUDIT_LOG_CLEANUP_INTERVAL_MINUTES:
   BASEROW_ENTERPRISE_AUDIT_LOG_RETENTION_DAYS:
   BASEROW_ALLOW_MULTIPLE_SSO_PROVIDERS_FOR_SAME_ACCOUNT:
diff --git a/web-frontend/modules/automation/nodeTypes.js b/web-frontend/modules/automation/nodeTypes.js
index 2ee877e43a..e27cb4bf1a 100644
--- a/web-frontend/modules/automation/nodeTypes.js
+++ b/web-frontend/modules/automation/nodeTypes.js
@@ -393,7 +393,9 @@ export class CorePeriodicTriggerNodeType extends TriggerNodeTypeMixin(
     }
 
     const intervalLabels = {
-      MINUTE: this.app.i18n.t('periodicForm.everyMinute'),
+      MINUTE: this.app.i18n.t('periodicForm.everyMinute', {
+        minute: node.service.minute,
+      }),
       HOUR: this.app.i18n.t('periodicForm.everyHour'),
       DAY: this.app.i18n.t('periodicForm.everyDay'),
       WEEK: this.app.i18n.t('periodicForm.everyWeek'),
diff --git a/web-frontend/modules/core/module.js b/web-frontend/modules/core/module.js
index 43784098f7..fb4403d880 100644
--- a/web-frontend/modules/core/module.js
+++ b/web-frontend/modules/core/module.js
@@ -110,6 +110,8 @@ export default function CoreModule(options) {
     BASEROW_FRONTEND_SAME_SITE_COOKIE:
       process.env.BASEROW_FRONTEND_SAME_SITE_COOKIE ?? 'lax',
     BASEROW_DISABLE_SUPPORT: process.env.BASEROW_DISABLE_SUPPORT ?? '',
+    BASEROW_INTEGRATIONS_PERIODIC_MINUTE_MIN:
+      process.env.BASEROW_INTEGRATIONS_PERIODIC_MINUTE_MIN ?? '1',
   }
 
   this.options.publicRuntimeConfig.BASEROW_EMBEDDED_SHARE_URL =
diff --git a/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue b/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue
index 2a7b6b0bea..6a5aedcebd 100644
--- a/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue
+++ b/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue
@@ -9,7 +9,10 @@
       class="margin-bottom-2"
     >
       <Dropdown v-model="values.interval" size="large">
-        <DropdownItem :name="$t('periodicForm.everyMinute')" value="MINUTE" />
+        <DropdownItem
+          :name="$t('periodicForm.everyMinuteDefault')"
+          value="MINUTE"
+        />
         <DropdownItem :name="$t('periodicForm.everyHour')" value="HOUR" />
         <DropdownItem :name="$t('periodicForm.everyDay')" value="DAY" />
         <DropdownItem :name="$t('periodicForm.everyWeek')" value="WEEK" />
@@ -19,6 +22,21 @@
 
     <div v-if="values.interval !== null">
       <div class="flex align-items-start margin-bottom-2">
+        <FormGroup
+          v-if="showMinuteFrequencyField"
+          small-label
+          :label="$t('periodicForm.minuteFrequency')"
+          required
+        >
+          <FormInput
+            v-model="v$.user.minute.$model"
+            size="large"
+            type="number"
+            :min="1"
+            :max="59"
+            :placeholder="$t('periodicForm.minuteFrequencyPlaceholder')"
+          />
+        </FormGroup>
         <FormGroup
           v-if="showHourField"
           small-label
@@ -105,7 +123,7 @@
 
 <script>
 import { useVuelidate } from '@vuelidate/core'
-import { between, required, helpers } from '@vuelidate/validators'
+import { between, required, integer, helpers } from '@vuelidate/validators'
 import form from '@baserow/modules/core/mixins/form'
 
 export default {
@@ -142,6 +160,12 @@ export default {
     }
   },
   computed: {
+    showMinuteFrequencyField() {
+      return this.values.interval === 'MINUTE'
+    },
+    minimumMinuteFrequency() {
+      return this.$config.BASEROW_INTEGRATIONS_PERIODIC_MINUTE_MIN
+    },
     showHourField() {
       return ['DAY', 'WEEK', 'MONTH'].includes(this.values.interval)
     },
@@ -193,9 +217,15 @@ export default {
             this.$t('error.requiredField'),
             required
           ),
+          integer: helpers.withMessage(this.$t('error.integerField'), integer),
           between: helpers.withMessage(
-            this.$t('error.minMaxValueField', { min: 0, max: 59 }),
-            between(0, 59)
+            this.showMinuteFrequencyField
+              ? this.$t('error.minMaxValueField', {
+                  min: this.minimumMinuteFrequency,
+                  max: 59,
+                })
+              : this.$t('error.minMaxValueField', { min: 0, max: 59 }),
+            this.showMinuteFrequencyField ? between(1, 59) : between(0, 59)
           ),
         },
         hour: {
@@ -226,7 +256,21 @@ export default {
     'user.hour': 'syncValuesFromUser',
     'user.day_of_week': 'syncValuesFromUser',
     'user.day_of_month': 'syncValuesFromUser',
-    'values.interval': 'syncValuesFromUser',
+    'values.interval'(newInterval, oldInterval) {
+      // When we change *to* MINUTE, we default to the minimum frequency
+      // that is granted to this Baserow instance type.
+      // When we change *from* MINUTE, reset minute to 0.
+      if (
+        this.user.minute === 0 &&
+        newInterval === 'MINUTE' &&
+        oldInterval !== 'MINUTE'
+      ) {
+        this.user.minute = this.minimumMinuteFrequency
+      } else if (newInterval !== 'MINUTE' && oldInterval === 'MINUTE') {
+        this.user.minute = 0
+      }
+      this.syncValuesFromUser()
+    },
   },
   mounted() {
     this.syncUserFromValues()
@@ -263,6 +307,7 @@ export default {
     syncValuesFromUser() {
       this.v$.$touch()
       if (this.v$.values.interval.$invalid) return
+      if (this.showMinuteFrequencyField && this.v$.user.minute.$invalid) return
       if (this.showMinuteField && this.v$.user.minute.$invalid) return
       if (this.showHourField && this.v$.user.hour.$invalid) return
       if (
@@ -279,12 +324,7 @@ export default {
         day_of_month: dayOfMonth,
       } = this.user
 
-      if (interval === 'MINUTE') {
-        this.values = { ...this.values, interval }
-        return
-      }
-
-      if (interval === 'HOUR') {
+      if (interval === 'MINUTE' || interval === 'HOUR') {
         this.values = { ...this.values, interval, minute }
         return
       }
@@ -345,11 +385,7 @@ export default {
         day_of_month: dayOfMonth,
       } = this.values
 
-      if (interval === 'MINUTE') {
-        return
-      }
-
-      if (interval === 'HOUR') {
+      if (interval === 'MINUTE' || interval === 'HOUR') {
         this.user.minute = minute
         return
       }
diff --git a/web-frontend/modules/integrations/locales/en.json b/web-frontend/modules/integrations/locales/en.json
index 01e48a673c..b49dc63edc 100644
--- a/web-frontend/modules/integrations/locales/en.json
+++ b/web-frontend/modules/integrations/locales/en.json
@@ -251,19 +251,22 @@
   "periodicForm": {
     "intervalLabel": "Interval",
     "intervalHelper": "Choose how frequently you want this workflow to run",
-    "everyMinute": "Every minute",
+    "everyMinute": "Every {minute} minutes",
+    "everyMinuteDefault": "Every specified minutes",
     "everyHour": "Every hour",
     "everyDay": "Every day",
     "everyWeek": "Every week",
     "everyMonth": "Every month",
     "hour": "Hour",
     "minute": "Minute",
+    "minuteFrequency": "Every minutes",
     "dayOfWeek": "Day of week",
     "dayOfMonth": "Day of month",
     "hourPlaceholder": "0-23",
     "minutePlaceholder": "0-59",
+    "minuteFrequencyPlaceholder": "15",
     "dayOfMonthPlaceholder": "1-31",
-    "minuteHelper": "This workflow will run every minute",
+    "minuteHelper": "This workflow will run every specified minutes",
     "hourHelper": "This workflow will run every hour at the specified minute in your local timezone ({timezone})",
     "dayHelper": "This workflow will run every day at the specified time in your local timezone ({timezone})",
     "weekHelper": "This workflow will run every week on the specified day and time in your local timezone ({timezone})",

From eec9a4705b876066cfddf5ca124f94385cbb8972 Mon Sep 17 00:00:00 2001
From: Peter Evans <peter@baserow.io>
Date: Mon, 10 Nov 2025 17:02:42 +0000
Subject: [PATCH 5/6] Update the guided tour locale keys so they can't clash
 with other ones. (#4198)

---
 .../modules/automation/guidedTourTypes.js     | 28 +++++++++----------
 .../modules/automation/locales/en.json        | 14 +++++-----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/web-frontend/modules/automation/guidedTourTypes.js b/web-frontend/modules/automation/guidedTourTypes.js
index 40f419fdf4..09d59e3fb5 100644
--- a/web-frontend/modules/automation/guidedTourTypes.js
+++ b/web-frontend/modules/automation/guidedTourTypes.js
@@ -5,11 +5,11 @@ import {
 
 class WelcomeGuidedTourStep extends GuidedTourStep {
   get title() {
-    return this.app.i18n.t('welcomeGuidedTourStep.title')
+    return this.app.i18n.t('automationWelcomeGuidedTourStep.title')
   }
 
   get content() {
-    return this.app.i18n.t('welcomeGuidedTourStep.content')
+    return this.app.i18n.t('automationWelcomeGuidedTourStep.content')
   }
 
   get selectors() {
@@ -23,11 +23,11 @@ class WelcomeGuidedTourStep extends GuidedTourStep {
 
 class GraphGuidedTourStep extends GuidedTourStep {
   get title() {
-    return this.app.i18n.t('graphGuidedTourStep.title')
+    return this.app.i18n.t('automationGraphGuidedTourStep.title')
   }
 
   get content() {
-    return this.app.i18n.t('graphGuidedTourStep.content')
+    return this.app.i18n.t('automationGraphGuidedTourStep.content')
   }
 
   get selectors() {
@@ -45,11 +45,11 @@ class GraphGuidedTourStep extends GuidedTourStep {
 
 class HistoryGuidedTourStep extends GuidedTourStep {
   get title() {
-    return this.app.i18n.t('historyGuidedTourStep.title')
+    return this.app.i18n.t('automationHistoryGuidedTourStep.title')
   }
 
   get content() {
-    return this.app.i18n.t('historyGuidedTourStep.content')
+    return this.app.i18n.t('automationHistoryGuidedTourStep.content')
   }
 
   get selectors() {
@@ -63,11 +63,11 @@ class HistoryGuidedTourStep extends GuidedTourStep {
 
 class TestRunGuidedTourStep extends GuidedTourStep {
   get title() {
-    return this.app.i18n.t('testRunGuidedTourStep.title')
+    return this.app.i18n.t('automationTestRunGuidedTourStep.title')
   }
 
   get content() {
-    return this.app.i18n.t('testRunGuidedTourStep.content')
+    return this.app.i18n.t('automationTestRunGuidedTourStep.content')
   }
 
   get selectors() {
@@ -81,11 +81,11 @@ class TestRunGuidedTourStep extends GuidedTourStep {
 
 class PublishGuidedTourStep extends GuidedTourStep {
   get title() {
-    return this.app.i18n.t('publishGuidedTourStep.title')
+    return this.app.i18n.t('automationPublishGuidedTourStep.title')
   }
 
   get content() {
-    return this.app.i18n.t('publishGuidedTourStep.content')
+    return this.app.i18n.t('automationPublishGuidedTourStep.content')
   }
 
   get selectors() {
@@ -99,11 +99,11 @@ class PublishGuidedTourStep extends GuidedTourStep {
 
 class StateGuidedTourStep extends GuidedTourStep {
   get title() {
-    return this.app.i18n.t('workflowStateGuidedTourStep.title')
+    return this.app.i18n.t('automationWorkflowStateGuidedTourStep.title')
   }
 
   get content() {
-    return this.app.i18n.t('workflowStateGuidedTourStep.content')
+    return this.app.i18n.t('automationWorkflowStateGuidedTourStep.content')
   }
 
   get selectors() {
@@ -117,11 +117,11 @@ class StateGuidedTourStep extends GuidedTourStep {
 
 class DocsGuidedTourStep extends GuidedTourStep {
   get title() {
-    return this.app.i18n.t('docsGuidedTourStep.title')
+    return this.app.i18n.t('automationDocsGuidedTourStep.title')
   }
 
   get content() {
-    return this.app.i18n.t('docsGuidedTourStep.content')
+    return this.app.i18n.t('automationDocsGuidedTourStep.content')
   }
 
   get selectors() {
diff --git a/web-frontend/modules/automation/locales/en.json b/web-frontend/modules/automation/locales/en.json
index be57570bb5..cb9386412a 100644
--- a/web-frontend/modules/automation/locales/en.json
+++ b/web-frontend/modules/automation/locales/en.json
@@ -1,29 +1,29 @@
 {
-  "welcomeGuidedTourStep": {
+  "automationWelcomeGuidedTourStep": {
     "title": "Welcome to Baserow Automations!",
     "content": "Let's take a quick tour. You'll see how to set up triggers, add actions, test your workflow, and publish it — no coding required."
   },
-  "graphGuidedTourStep": {
+  "automationGraphGuidedTourStep": {
     "title": "Manage your workflow graph here",
     "content": "Create a trigger and actions here to define what the workflow should do. Select a trigger or action to configure it in the side panel."
   },
-  "testRunGuidedTourStep": {
+  "automationTestRunGuidedTourStep": {
     "title": "Test your workflow",
     "content": "When you're ready, start a test run to see your workflow in action. The trigger will run once to simulate a full execution."
   },
-  "historyGuidedTourStep": {
+  "automationHistoryGuidedTourStep": {
     "title": "View workflow history",
     "content": "Use the history panel to review past test runs and published executions. It's a great way to debug or confirm results."
   },
-  "publishGuidedTourStep": {
+  "automationPublishGuidedTourStep": {
     "title": "Publish your workflow",
     "content": "Once you've tested and refined your setup, publish your workflow to make it live. Its trigger will now run automatically on schedule."
   },
-  "workflowStateGuidedTourStep": {
+  "automationWorkflowStateGuidedTourStep": {
     "title": "Control workflow state",
     "content": "From here, you can pause or resume your workflow at any time. You're always in control of whether it's active or disabled."
   },
-  "docsGuidedTourStep": {
+  "automationDocsGuidedTourStep": {
     "title": "Explore the documentation",
     "content": "If you ever get stuck or want to learn more, click the highlighted button for detailed guides and FAQs about building automations in Baserow."
   },

From 15beb4f3886c0a4fab1fd44ad740e71dd9055d80 Mon Sep 17 00:00:00 2001
From: Peter Evans <peter@baserow.io>
Date: Mon, 10 Nov 2025 17:03:18 +0000
Subject: [PATCH 6/6] When validating the minimum minute frequency, actually
 use the value in the between rule. (#4197)

---
 .../core/components/services/CorePeriodicServiceForm.vue      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue b/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue
index 6a5aedcebd..0adb6e0f07 100644
--- a/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue
+++ b/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue
@@ -225,7 +225,9 @@ export default {
                   max: 59,
                 })
               : this.$t('error.minMaxValueField', { min: 0, max: 59 }),
-            this.showMinuteFrequencyField ? between(1, 59) : between(0, 59)
+            this.showMinuteFrequencyField
+              ? between(this.minimumMinuteFrequency, 59)
+              : between(0, 59)
           ),
         },
         hour: {