diff --git a/src/components/designer/es-modeling/panels/CommandDefinitionPanel.vue b/src/components/designer/es-modeling/panels/CommandDefinitionPanel.vue
index 1f498146..d12a6fb5 100644
--- a/src/components/designer/es-modeling/panels/CommandDefinitionPanel.vue
+++ b/src/components/designer/es-modeling/panels/CommandDefinitionPanel.vue
@@ -415,9 +415,12 @@
                                         case "Boolean":
                                             fieldDescriptorsName = fieldDescriptorsName.concat(`${fieldItem.name}=true ` )
                                             break;
+                                        default:
+                                            fieldDescriptorsName = fieldDescriptorsName.concat(`${fieldItem.name}="value" `);
+                                            break;
                                     }
                                 }
-                                else if(!fieldItem.isKey && (fieldItem.className != 'String' || fieldItem.className != 'Long' || fieldItem.className != 'Integer' || fieldItem.className != 'Double' || fieldItem.className != 'BigDecimal')){
+                                else if(!fieldItem.isKey && (fieldItem.className != 'String' || fieldItem.className != 'Long' || fieldItem.className != 'Integer' || fieldItem.className != 'Double' || fieldItem.className != 'BigDecimal' || fieldItem.className != 'Date')){
                                     Object.values((me.relatedAggregate.aggregateRoot.entities.relations) || {})
                                     .filter(relation =>  relation.targetElement.namePascalCase === fieldItem.className)
                                     .forEach((field) => {
@@ -440,6 +443,9 @@
                                                     case "Boolean":
                                                         tempField = tempField.concat(`"${item.nameCamelCase}":"true"`, ", ");
                                                         break;
+                                                    default:
+                                                        tempField = tempField.concat(`"${item.nameCamelCase}":"value"`, ", ");
+                                                        break;
                                                 }
                                             });
                                             tempField = tempField.slice(0, -2);
@@ -500,6 +506,9 @@
                                         case "Boolean":
                                             fieldDescriptorsName = fieldDescriptorsName.concat(`${fieldItem.name}=true ` )
                                             break;
+                                        default:
+                                            fieldDescriptorsName = fieldDescriptorsName.concat(`${fieldItem.name}="value" ` )
+                                            break;
                                     }
                                 }else if(!fieldItem.isKey && (fieldItem.className != 'String' || fieldItem.className != 'Long' || fieldItem.className != 'Integer' || fieldItem.className != 'Double' || fieldItem.className != 'BigDecimal')){
                                     Object.values((me.relatedAggregate.aggregateRoot.entities.relations) || {})
@@ -524,6 +533,9 @@
                                                     case "Boolean":
                                                         tempField = tempField.concat(`"${item.nameCamelCase}":"true"`, ", ");
                                                         break;
+                                                    default:
+                                                        tempField = tempField.concat(`"${item.nameCamelCase}":"value"`, ", ");
+                                                        break;
                                                 }
                                             });
                                             tempField = tempField.slice(0, -2);