diff --git a/backend/src/Squidex.Domain.Apps.Core.Model/Contents/ContentData.cs b/backend/src/Squidex.Domain.Apps.Core.Model/Contents/ContentData.cs
index b2f47c3d9..6a68882af 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Model/Contents/ContentData.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Model/Contents/ContentData.cs
@@ -14,11 +14,6 @@ namespace Squidex.Domain.Apps.Core.Contents
 {
     public sealed class ContentData : Dictionary<string, ContentFieldData?>, IEquatable<ContentData>
     {
-        public IEnumerable<KeyValuePair<string, ContentFieldData?>> ValidValues
-        {
-            get => this.Where(x => x.Value != null);
-        }
-
         public ContentData()
             : base(StringComparer.Ordinal)
         {
diff --git a/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs b/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs
index 548513d56..848df7ed9 100644
--- a/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs
+++ b/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs
@@ -20,6 +20,7 @@ using Squidex.Domain.Apps.Core.Assets;
 using Squidex.Domain.Apps.Core.Contents;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Json.Objects;
+using Squidex.Infrastructure.Queries;
 
 namespace Squidex.Areas.Api.Config.OpenApi
 {
@@ -119,7 +120,10 @@ namespace Squidex.Areas.Api.Config.OpenApi
                 CreateStringMap<Status>(),
 
                 CreateObjectMap<JsonObject>(),
-                CreateObjectMap<AssetMetadata>()
+                CreateObjectMap<AssetMetadata>(),
+
+                CreateAnyMap<IJsonValue>(),
+                CreateAnyMap<FilterNode<IJsonValue>>()
             };
 
             settings.SchemaType = SchemaType.OpenApi3;
@@ -149,5 +153,13 @@ namespace Squidex.Areas.Api.Config.OpenApi
                 schema.Format = format;
             });
         }
+
+        private static ITypeMapper CreateAnyMap<T>()
+        {
+            return new PrimitiveTypeMapper(typeof(T), schema =>
+            {
+                schema.Type = JsonObjectType.None;
+            });
+        }
     }
 }
diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateContentsJobDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateContentsJobDto.cs
index 903552489..cad4c462b 100644
--- a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateContentsJobDto.cs
+++ b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateContentsJobDto.cs
@@ -9,8 +9,6 @@ using NodaTime;
 using Squidex.Domain.Apps.Core.Contents;
 using Squidex.Domain.Apps.Entities.Contents.Commands;
 using Squidex.Infrastructure;
-using Squidex.Infrastructure.Json.Objects;
-using Squidex.Infrastructure.Queries;
 using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Areas.Api.Controllers.Contents.Models
@@ -20,7 +18,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Models
         /// <summary>
         /// An optional query to identify the content to update.
         /// </summary>
-        public Query<IJsonValue>? Query { get; set; }
+        public JsonQueryDto? Query { get; set; }
 
         /// <summary>
         /// An optional id of the content to update.
diff --git a/backend/src/Squidex/Areas/Api/Controllers/JsonQueryDto.cs b/backend/src/Squidex/Areas/Api/Controllers/JsonQueryDto.cs
new file mode 100644
index 000000000..fff98883e
--- /dev/null
+++ b/backend/src/Squidex/Areas/Api/Controllers/JsonQueryDto.cs
@@ -0,0 +1,18 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using NJsonSchema.Annotations;
+using Squidex.Infrastructure.Json.Objects;
+using Squidex.Infrastructure.Queries;
+
+namespace Squidex.Areas.Api.Controllers
+{
+    [JsonSchemaFlatten]
+    public sealed class JsonQueryDto : Query<IJsonValue>
+    {
+    }
+}
diff --git a/frontend/app/features/assets/pages/assets-page.component.html b/frontend/app/features/assets/pages/assets-page.component.html
index c3d4f461d..513fa2660 100644
--- a/frontend/app/features/assets/pages/assets-page.component.html
+++ b/frontend/app/features/assets/pages/assets-page.component.html
@@ -2,7 +2,7 @@
 
 <sqx-layout layout="main" titleText="i18n:common.assets" titleIcon="assets">    
     <ng-container menu>
-        <div class="row flex-nowrap gx-2">
+        <div class="row flex-nowrap flex-grow-1 gx-2">
             <div class="col-auto offset-xl-2">
                 <button type="button" class="btn btn-text-secondary" (click)="reload()" title="i18n:assets.refreshTooltip" shortcut="CTRL + B">
                     <i class="icon-reset"></i> {{ 'common.refresh' | sqxTranslate }}
diff --git a/frontend/app/features/content/pages/content/content-page.component.html b/frontend/app/features/content/pages/content/content-page.component.html
index 228259932..0d68850a1 100644
--- a/frontend/app/features/content/pages/content/content-page.component.html
+++ b/frontend/app/features/content/pages/content/content-page.component.html
@@ -3,19 +3,21 @@
 <form [formGroup]="contentForm.form" (ngSubmit)="saveAndPublish()">
     <sqx-layout layout="main" [hideSidebar]="!content">
         <ng-container title>
-            <a class="btn btn-text-secondary" (click)="back()" *ngIf="schema.type === 'Default'">
-                <i class="icon-angle-left"></i>
-            </a>
+            <div class="d-flex align-items-center">
+                <a class="btn btn-text-secondary" (click)="back()" *ngIf="schema.type !== 'Singleton'">
+                    <i class="icon-angle-left"></i>
+                </a>
 
-            <ng-container *ngIf="content; noContentTitle">
-                <sqx-title message="i18n:contents.editPageTitle"></sqx-title>
-            </ng-container>
+                <ng-container *ngIf="content; else noContentTitle">
+                    <sqx-title message="i18n:contents.editPageTitle"></sqx-title>
+                </ng-container>
 
-            <ng-template #noContentTitle>
-                {{ 'contents.createTitle' | sqxTranslate }}
+                <ng-template #noContentTitle>
+                    <h3>{{ 'contents.createTitle' | sqxTranslate }}</h3>
 
-                <sqx-title message="i18n:contents.createPageTitle"></sqx-title>
-            </ng-template>
+                    <sqx-title message="i18n:contents.createPageTitle"></sqx-title>
+                </ng-template>
+            </div>
         </ng-container>
         
         <ng-container menu>
diff --git a/frontend/app/features/content/pages/contents/contents-page.component.html b/frontend/app/features/content/pages/contents/contents-page.component.html
index 7803c5e2f..83474525c 100644
--- a/frontend/app/features/content/pages/contents/contents-page.component.html
+++ b/frontend/app/features/content/pages/contents/contents-page.component.html
@@ -2,7 +2,7 @@
 
 <sqx-layout layout="main" titleText="i18n:common.contents" titleIcon="contents">
     <ng-container menu>
-        <div class="row flex-nowrap gx-2">
+        <div class="row flex-nowrap flex-grow-1 gx-2">
             <div class="col-auto ms-8">
                 <sqx-notifo topic="apps/{{contentsState.appId}}/schemas/{{schema?.id}}/contents"></sqx-notifo>