diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 287b83127f..b9ce99604f 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -201,6 +201,8 @@ export default {
                 if (foundMetadata.enumerations !== undefined) {
                     this.operationFormat = 'enum';
                     this.enumerations = foundMetadata.enumerations;
+                } else if (foundMetadata.format === 'string' || foundMetadata.format === 'number') {
+                    this.operationFormat = foundMetadata.format;
                 } else if (foundMetadata.hints.hasOwnProperty('range')) {
                     this.operationFormat = 'number';
                 } else if (foundMetadata.hints.hasOwnProperty('domain')) {
@@ -208,7 +210,7 @@ export default {
                 } else if (foundMetadata.key === 'name') {
                     this.operationFormat = 'string';
                 } else {
-                    this.operationFormat = 'string';
+                    this.operationFormat = 'number';
                 }
             }
             this.updateInputVisibilityAndValues();