diff --git a/Olive.Entities.Data.Replication.DataGenerator.UI/ModuleGenerators/FormModuleGenerator.cs b/Olive.Entities.Data.Replication.DataGenerator.UI/ModuleGenerators/FormModuleGenerator.cs
index 48c101c2..b9512b18 100644
--- a/Olive.Entities.Data.Replication.DataGenerator.UI/ModuleGenerators/FormModuleGenerator.cs
+++ b/Olive.Entities.Data.Replication.DataGenerator.UI/ModuleGenerators/FormModuleGenerator.cs
@@ -37,7 +37,11 @@ private string RenderField(PropertyInfo prop, object item)
             builder.AppendLine(" <div class=\"form-group row\" style={margin:20px}>");
             builder.AppendLine($"<label for='{prop.Name}' class='col-sm-2 col-form-label'>{prop.Name}</label>");
             builder.AppendLine("<div class=\"col-sm-10\">");
-            builder.AppendLine($"<input type='{GetFieldType(prop)}' value='{GetDefaultValue(prop, item)}' name='{prop.Name}' class='{GetFieldClass(prop)}' placeholder='{prop.Name}'>");
+            var fieldType = GetFieldType(prop);
+            if (fieldType == "checkbox")
+                builder.AppendLine($"<input type='{fieldType}' name='{prop.Name}' class='{GetFieldClass(prop)}' placeholder='{prop.Name}'>");
+            else
+                builder.AppendLine($"<input type='{fieldType}' value='{GetDefaultValue(prop, item)}' name='{prop.Name}' class='{GetFieldClass(prop)}' placeholder='{prop.Name}'>");
             builder.AppendLine("</div>");
             builder.AppendLine("</div>");
             return builder.ToString();
diff --git a/Olive.Entities.Data.Replication.DataGenerator.UI/ModuleGenerators/FormSubmitGenerator.cs b/Olive.Entities.Data.Replication.DataGenerator.UI/ModuleGenerators/FormSubmitGenerator.cs
index 6ee2a33e..269ab845 100644
--- a/Olive.Entities.Data.Replication.DataGenerator.UI/ModuleGenerators/FormSubmitGenerator.cs
+++ b/Olive.Entities.Data.Replication.DataGenerator.UI/ModuleGenerators/FormSubmitGenerator.cs
@@ -25,8 +25,8 @@ public async Task<string> Render(string nameSpace, string typeName)
                 if (item == null) item = _type.CreateInstance<IEntity>();
                 foreach (var column in GetColumns())
                 {
-                    var val = form.FirstOrDefault(x => x.Key == column.Name).Value.ToString() ?? string.Empty;
-                    column.SetValue(item, ConvertValue(column, val));
+                    var val = form.FirstOrDefault(x => x.Key == column.Name).Value.ToStringOrEmpty() ?? string.Empty;
+                    column.SetValue(item, ConvertValue(column, val == "on" ? "true" : val));
                 }
                 try
                 {
diff --git a/Olive.Entities.Data.Replication.DataGenerator.UI/Olive.Entities.Data.Replication.DataGenerator.UI.csproj b/Olive.Entities.Data.Replication.DataGenerator.UI/Olive.Entities.Data.Replication.DataGenerator.UI.csproj
index 8419132d..9508b7d3 100644
--- a/Olive.Entities.Data.Replication.DataGenerator.UI/Olive.Entities.Data.Replication.DataGenerator.UI.csproj
+++ b/Olive.Entities.Data.Replication.DataGenerator.UI/Olive.Entities.Data.Replication.DataGenerator.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<Version>1.0.0.0</Version>
+	<Version>1.0.0.1</Version>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Olive.Entities.Data.Replication.DataGenerator.UI/ReplicationDataGeneratorUICommand.cs b/Olive.Entities.Data.Replication.DataGenerator.UI/ReplicationDataGeneratorUICommand.cs
index 0c43d5f6..26736ced 100644
--- a/Olive.Entities.Data.Replication.DataGenerator.UI/ReplicationDataGeneratorUICommand.cs
+++ b/Olive.Entities.Data.Replication.DataGenerator.UI/ReplicationDataGeneratorUICommand.cs
@@ -45,7 +45,9 @@ public async Task<string> Run()
                 content =  await new FormModuleGenerator(domainType, _Endpoint).Render(_NameSpace, _TypeName);
             else
                 content =  await new ListModuleGenerator(domainType, _Endpoint).Render(_NameSpace, _TypeName);
-           await Response.WriteAsync(content);
+            
+            await Task.Delay(1000);
+            //await Response.WriteAsync(content);
 
             return content;