diff --git a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
index 42c2ba178..3dfd01123 100644
--- a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
+++ b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
@@ -25,11 +25,11 @@ namespace Squidex.Pipeline
 
         static ApiExceptionFilterAttribute()
         {
+            AddHandler<ValidationException>(OnValidationException);
             AddHandler<DomainObjectNotFoundException>(OnDomainObjectNotFoundException);
             AddHandler<DomainObjectVersionException>(OnDomainObjectVersionException);
             AddHandler<DomainForbiddenException>(OnDomainForbiddenException);
             AddHandler<DomainException>(OnDomainException);
-            AddHandler<ValidationException>(OnValidationException);
         }
 
         private static IActionResult OnDomainObjectNotFoundException(DomainObjectNotFoundException ex)
diff --git a/src/Squidex/Pipeline/ApiModelValidationAttribute.cs b/src/Squidex/Pipeline/ApiModelValidationAttribute.cs
index 3c96afe51..41bb86156 100644
--- a/src/Squidex/Pipeline/ApiModelValidationAttribute.cs
+++ b/src/Squidex/Pipeline/ApiModelValidationAttribute.cs
@@ -35,6 +35,10 @@ namespace Squidex.Pipeline
                         {
                             errors.Add(new ValidationError(e.ErrorMessage, m.Key));
                         }
+                        else if (e.Exception is JsonException jsonException)
+                        {
+                            errors.Add(new ValidationError(jsonException.Message));
+                        }
                     }
                 }
 
diff --git a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html
index 3b9b50684..3ed1825bb 100644
--- a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html
@@ -60,7 +60,7 @@
             <button type="reset" class="float-left btn btn-secondary" (click)="complete()">Cancel</button>
 
             <div class="float-right">
-                <button class="btn btn-success" (click)="addField(false)">Create and close</button>
+                <button class="btn btn-success mr-1" (click)="addField(false)">Create and close</button>
                 <button class="btn btn-success" (click)="addField(true)">Create and new field</button>
             </div>
         </ng-container>
diff --git a/src/Squidex/app/shared/services/schemas.types.ts b/src/Squidex/app/shared/services/schemas.types.ts
index 080ac7d97..17f759351 100644
--- a/src/Squidex/app/shared/services/schemas.types.ts
+++ b/src/Squidex/app/shared/services/schemas.types.ts
@@ -215,7 +215,7 @@ export class GeolocationFieldPropertiesDto extends FieldPropertiesDto {
     constructor(
         props?: Partial<GeolocationFieldPropertiesDto>
     ) {
-        super('Default', props);
+        super('Map', props);
     }
 
     public accept<T>(visitor: FieldPropertiesVisitor<T>): T {