diff --git a/client/src/views/admin/dynamic-logic/conditions-string/group-base.js b/client/src/views/admin/dynamic-logic/conditions-string/group-base.js
index a2362b23c1..ed1938e94d 100644
--- a/client/src/views/admin/dynamic-logic/conditions-string/group-base.js
+++ b/client/src/views/admin/dynamic-logic/conditions-string/group-base.js
@@ -74,7 +74,9 @@ Espo.define('views/admin/dynamic-logic/conditions-string/group-base', 'view', fu
 
             item = item || {};
 
-            var type = item.type || 'equals';
+            var additionalData = item.data || {};
+
+            var type = additionalData.type || item.type || 'equals';
 
             var viewName = this.getMetadata().get(['clientDefs', 'DynamicLogic', 'itemTypes', type, 'view']);
             if (!viewName) return;
diff --git a/client/src/views/admin/dynamic-logic/conditions-string/item-base.js b/client/src/views/admin/dynamic-logic/conditions-string/item-base.js
index 54364028b3..873c228276 100644
--- a/client/src/views/admin/dynamic-logic/conditions-string/item-base.js
+++ b/client/src/views/admin/dynamic-logic/conditions-string/item-base.js
@@ -52,10 +52,10 @@ Espo.define('views/admin/dynamic-logic/conditions-string/item-base', 'view', fun
             this.operator = this.options.operator || this.operator;
             this.operatorString = this.options.operatorString || this.operatorString;
 
-            this.field = (this.itemData.data || {}).field || this.itemData.attribute;
-
             this.additionalData = (this.itemData.data || {});
 
+            this.field = (this.itemData.data || {}).field || this.itemData.attribute;
+
             this.wait(true);
 
             this.getModelFactory().create(this.scope, function (model) {
@@ -70,7 +70,9 @@ Espo.define('views/admin/dynamic-logic/conditions-string/item-base', 'view', fun
         },
 
         populateValues: function () {
-            this.model.set(this.itemData.attribute, this.itemData.value);
+            if (this.itemData.attribute) {
+                this.model.set(this.itemData.attribute, this.itemData.value);
+            }
             this.model.set(this.additionalData.values || {});
         },