diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs
index 9be779afa..6d27c29c2 100644
--- a/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs
+++ b/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs
@@ -73,6 +73,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
                                     var result = new AssetCreatedResult(existing, true);
 
                                     context.Complete(result);
+                                    await next();
                                     return;
                                 }
                             }
@@ -128,7 +129,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
 
         private async Task HandleCoreAsync(CommandContext context, Func<Task> next)
         {
-            await HandleAsync(context, next);
+            await base.HandleAsync(context, next);
 
             if (context.PlainResult is IAssetEntity asset && !(context.PlainResult is IAssetEntityEnriched))
             {
diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs
index 3178216fd..eafb420de 100644
--- a/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs
@@ -28,7 +28,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
 
         public override async Task HandleAsync(CommandContext context, Func<Task> next)
         {
-            await HandleAsync(context, next);
+            await base.HandleAsync(context, next);
 
             if (context.PlainResult is IContentEntity content)
             {
diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs
index 428506c61..c4363c9ea 100644
--- a/src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs
@@ -72,19 +72,24 @@ namespace Squidex.Domain.Apps.Entities.Contents
 
         private async Task ResolveColorAsync(IContentEntity content, ContentEntity result, Dictionary<(Guid, Status), StatusInfo> cache)
         {
-            if (!cache.TryGetValue((content.SchemaId.Id, content.Status), out var info))
+            result.StatusColor = await GetColorAsync(content.SchemaId, content.Status, cache);
+        }
+
+        private async Task<string> GetColorAsync(NamedId<Guid> schemaId, Status status, Dictionary<(Guid, Status), StatusInfo> cache)
+        {
+            if (!cache.TryGetValue((schemaId.Id, status), out var info))
             {
-                info = await contentWorkflow.GetInfoAsync(content.Status);
+                info = await contentWorkflow.GetInfoAsync(status);
 
                 if (info == null)
                 {
-                    info = new StatusInfo(content.Status, DefaultColor);
+                    info = new StatusInfo(status, DefaultColor);
                 }
 
-                cache[(content.SchemaId.Id, content.Status)] = info;
+                cache[(schemaId.Id, status)] = info;
             }
 
-            result.StatusColor = info.Color;
+            return info.Color;
         }
     }
 }
diff --git a/src/Squidex.Domain.Apps.Entities/History/ParsedHistoryEvent.cs b/src/Squidex.Domain.Apps.Entities/History/ParsedHistoryEvent.cs
index 92f18d5a2..7e5c018b3 100644
--- a/src/Squidex.Domain.Apps.Entities/History/ParsedHistoryEvent.cs
+++ b/src/Squidex.Domain.Apps.Entities/History/ParsedHistoryEvent.cs
@@ -53,14 +53,17 @@ namespace Squidex.Domain.Apps.Entities.History
 
             message = new Lazy<string>(() =>
             {
-                var result = texts[item.Message];
-
-                foreach (var kvp in item.Parameters)
+                if (texts.TryGetValue(item.Message, out var result))
                 {
-                    result = result.Replace("[" + kvp.Key + "]", kvp.Value);
+                    foreach (var kvp in item.Parameters)
+                    {
+                        result = result.Replace("[" + kvp.Key + "]", kvp.Value);
+                    }
+
+                    return result;
                 }
 
-                return result;
+                return null;
             });
         }
     }
diff --git a/src/Squidex.Infrastructure/EventSourcing/DefaultEventDataFormatter.cs b/src/Squidex.Infrastructure/EventSourcing/DefaultEventDataFormatter.cs
index bbf07c80e..e3f800f4b 100644
--- a/src/Squidex.Infrastructure/EventSourcing/DefaultEventDataFormatter.cs
+++ b/src/Squidex.Infrastructure/EventSourcing/DefaultEventDataFormatter.cs
@@ -6,6 +6,7 @@
 // ==========================================================================
 
 using System;
+using System.Diagnostics;
 using Squidex.Infrastructure.Json;
 
 namespace Squidex.Infrastructure.EventSourcing
@@ -33,6 +34,11 @@ namespace Squidex.Infrastructure.EventSourcing
             if (payloadObj is IMigrated<IEvent> migratedEvent)
             {
                 payloadObj = migratedEvent.Migrate();
+
+                if (ReferenceEquals(migratedEvent, payloadObj))
+                {
+                    Debug.WriteLine("Migration should return new event.");
+                }
             }
 
             var envelope = new Envelope<IEvent>(payloadObj, eventData.Headers);
@@ -47,6 +53,11 @@ namespace Squidex.Infrastructure.EventSourcing
             if (migrate && eventPayload is IMigrated<IEvent> migratedEvent)
             {
                 eventPayload = migratedEvent.Migrate();
+
+                if (ReferenceEquals(migratedEvent, eventPayload))
+                {
+                    Debug.WriteLine("Migration should return new event.");
+                }
             }
 
             var payloadType = typeNameRegistry.GetName(eventPayload.GetType());
diff --git a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs
index cb2b1ecde..4a208143c 100644
--- a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs
+++ b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Squidex.Areas.Api.Controllers.History.Models;
@@ -48,7 +49,7 @@ namespace Squidex.Areas.Api.Controllers.History
         {
             var events = await historyService.QueryByChannelAsync(AppId, channel, 100);
 
-            var response = events.ToArray(HistoryEventDto.FromHistoryEvent);
+            var response = events.Select(HistoryEventDto.FromHistoryEvent).Where(x => x.Message != null).ToArray();
 
             return Ok(response);
         }
diff --git a/src/Squidex/app-config/webpack.config.js b/src/Squidex/app-config/webpack.config.js
index eea01650c..8c46363b7 100644
--- a/src/Squidex/app-config/webpack.config.js
+++ b/src/Squidex/app-config/webpack.config.js
@@ -251,7 +251,9 @@ module.exports = function (env) {
                 waitForLinting: isProduction
             })
         );
+    }
 
+    if (!isCoverage) {
         config.plugins.push(
             new plugins.NgToolsWebpack.AngularCompilerPlugin({
                 directTemplateLoading: true,
diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.html b/src/Squidex/app/features/content/pages/content/content-page.component.html
index 22454ce68..71bd34cf4 100644
--- a/src/Squidex/app/features/content/pages/content/content-page.component.html
+++ b/src/Squidex/app/features/content/pages/content/content-page.component.html
@@ -36,6 +36,7 @@
                         [class.active]="dropdown.isOpen | async" #optionsButton>
                         <sqx-content-status
                             [status]="content.status"
+                            [statusColor]="content.statusColor"
                             [scheduledTo]="content.scheduleJob?.status"
                             [scheduledAt]="content.scheduleJob?.dueTime"
                             [isPending]="content.isPending"
@@ -56,8 +57,8 @@
                             </a>
 
                             <ng-container *ngIf="!schema.isSingleton">
-                                <a class="dropdown-item" *ngFor="let status of content.statusUpdates" (click)="changeStatus(status)">
-                                    Status to {{status}}
+                                <a class="dropdown-item" *ngFor="let info of content.statusUpdates" (click)="changeStatus(info.status)">
+                                    Change to <i class="icon-circle icon-sm" [style.color]="info.color"></i> {{info.status}}
                                 </a>
 
                                 <div class="dropdown-divider"></div>
diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts
index a95df25f2..f9f08e2c3 100644
--- a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts
+++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts
@@ -207,8 +207,8 @@ export class ContentsPageComponent extends ResourceOwner implements OnInit {
         const allActions = {};
 
         for (let content of this.contentsState.snapshot.contents.values) {
-            for (let status of content.statusUpdates) {
-                allActions[status] = true;
+            for (let info of content.statusUpdates) {
+                allActions[info.status] = info.color;
             }
         }
 
diff --git a/src/Squidex/app/features/content/shared/content-item.component.html b/src/Squidex/app/features/content/shared/content-item.component.html
index 2569c05e1..201ff85f9 100644
--- a/src/Squidex/app/features/content/shared/content-item.component.html
+++ b/src/Squidex/app/features/content/shared/content-item.component.html
@@ -24,6 +24,7 @@
 <td class="cell-time" *ngIf="!isCompact" [sqxStopClick]="isDirty">
     <sqx-content-status 
         [status]="content.status"
+        [statusColor]="content.statusColor"
         [scheduledTo]="content.scheduleJob?.status"
         [scheduledAt]="content.scheduleJob?.dueTime"
         [isPending]="content.isPending">
@@ -55,8 +56,8 @@
             <i class="icon-dots"></i>
         </button>
         <div class="dropdown-menu" *sqxModalView="dropdown;closeAlways:true" [sqxModalTarget]="optionsButton" @fade>
-            <a class="dropdown-item" *ngFor="let status of content.statusUpdates" (click)="emitChangeStatus(status)">
-                Status to {{status}}
+            <a class="dropdown-item" *ngFor="let info of content.statusUpdates" (click)="emitChangeStatus(info.status)">
+                Change to <i class="icon-circle icon-sm" [style.color]="info.color"></i> {{info.status}}
             </a>
             <a class="dropdown-item" (click)="emitClone(); dropdown.hide()" *ngIf="canClone">
                 Clone
diff --git a/src/Squidex/app/features/content/shared/content-status.component.html b/src/Squidex/app/features/content/shared/content-status.component.html
index 5f1a17a45..ed082cf65 100644
--- a/src/Squidex/app/features/content/shared/content-status.component.html
+++ b/src/Squidex/app/features/content/shared/content-status.component.html
@@ -1,11 +1,11 @@
 <ng-container *ngIf="scheduledTo; else noSchedule">
-    <span class="content-status content-status-{{scheduledTo | lowercase}} mr-1" title="{{tooltipText}}" titlePosition="top">
+    <span class="content-status pending mr-1"title="{{tooltipText}}" titlePosition="top">
         <i class="icon-clock"></i>
     </span>
 </ng-container>
 
 <ng-template #noSchedule>
-    <span class="content-status content-status-{{displayStatus | lowercase}} mr-1" title="{{tooltipText}}" titlePosition="top">
+    <span class="content-status default mr-1" [style.color]="statusColor" title="{{tooltipText}}" titlePosition="top">
         <i class="icon-circle"></i>
     </span>
 </ng-template>
diff --git a/src/Squidex/app/features/content/shared/content-status.component.scss b/src/Squidex/app/features/content/shared/content-status.component.scss
index 36696d04b..c9345b133 100644
--- a/src/Squidex/app/features/content/shared/content-status.component.scss
+++ b/src/Squidex/app/features/content/shared/content-status.component.scss
@@ -6,19 +6,11 @@
         vertical-align: middle;
     }
 
-    &-published {
-        color: $color-theme-green;
-    }
-
-    &-draft {
+    &.default {
         color: $color-text-decent;
     }
 
-    &-archived {
-        color: $color-theme-error;
-    }
-
-    &-pending {
+    &.pending {
         color: $color-dark-black;
     }
 
diff --git a/src/Squidex/app/features/content/shared/content-status.component.ts b/src/Squidex/app/features/content/shared/content-status.component.ts
index 6a929031f..37852c2c4 100644
--- a/src/Squidex/app/features/content/shared/content-status.component.ts
+++ b/src/Squidex/app/features/content/shared/content-status.component.ts
@@ -19,6 +19,9 @@ export class ContentStatusComponent {
     @Input()
     public status: string;
 
+    @Input()
+    public statusColor: string;
+
     @Input()
     public scheduledTo?: string;
 
diff --git a/src/Squidex/app/shared/components/schema-category.component.ts b/src/Squidex/app/shared/components/schema-category.component.ts
index 7d8e65e0c..c109f81ea 100644
--- a/src/Squidex/app/shared/components/schema-category.component.ts
+++ b/src/Squidex/app/shared/components/schema-category.component.ts
@@ -74,7 +74,7 @@ export class SchemaCategoryComponent extends StatefulComponent<State> implements
             let filtered = this.schemaCategory.schemas;
 
             if (this.forContent) {
-                filtered = filtered.filter(x => x.canReadContents);
+                filtered = filtered.filter(x => x.canReadContents && x.isPublished);
             }
 
             let isOpen = false;
diff --git a/src/Squidex/app/shared/services/contents.service.spec.ts b/src/Squidex/app/shared/services/contents.service.spec.ts
index 13c89f0fc..6e16aa5ce 100644
--- a/src/Squidex/app/shared/services/contents.service.spec.ts
+++ b/src/Squidex/app/shared/services/contents.service.spec.ts
@@ -353,6 +353,7 @@ describe('ContentsService', () => {
         return {
             id: `id${id}`,
             status: `Status${id}`,
+            statusColor: 'black',
             created: `${id % 1000 + 2000}-12-12T10:10:00`,
             createdBy: `creator-${id}`,
             lastModified: `${id % 1000 + 2000}-11-11T10:10:00`,
@@ -381,6 +382,7 @@ export function createContent(id: number, suffix = '') {
     return new ContentDto(links,
         `id${id}`,
         `Status${id}${suffix}`,
+        'black',
         DateTime.parseISO_UTC(`${id % 1000 + 2000}-12-12T10:10:00`), `creator-${id}`,
         DateTime.parseISO_UTC(`${id % 1000 + 2000}-11-11T10:10:00`), `modifier-${id}`,
         new ScheduleDto('Draft', `Scheduler${id}`, DateTime.parseISO_UTC(`${id % 1000 + 2000}-11-11T10:10:00`)),
diff --git a/src/Squidex/app/shared/services/contents.service.ts b/src/Squidex/app/shared/services/contents.service.ts
index 5607a8156..bed10aeca 100644
--- a/src/Squidex/app/shared/services/contents.service.ts
+++ b/src/Squidex/app/shared/services/contents.service.ts
@@ -58,7 +58,7 @@ export class ContentsDto extends ResultSet<ContentDto> {
 export class ContentDto {
     public readonly _links: ResourceLinks;
 
-    public readonly statusUpdates: string[];
+    public readonly statusUpdates: StatusInfo[];
 
     public readonly canDelete: boolean;
     public readonly canDraftDiscard: boolean;
@@ -69,6 +69,7 @@ export class ContentDto {
     constructor(links: ResourceLinks,
         public readonly id: string,
         public readonly status: string,
+        public readonly statusColor: string,
         public readonly created: DateTime,
         public readonly createdBy: string,
         public readonly lastModified: DateTime,
@@ -87,7 +88,7 @@ export class ContentDto {
         this.canDraftPublish = hasAnyLink(links, 'draft/publish');
         this.canUpdate = hasAnyLink(links, 'update');
 
-        this.statusUpdates = Object.keys(links).filter(x => x.startsWith('status/')).map(x => x.substr(7));
+        this.statusUpdates = Object.keys(links).filter(x => x.startsWith('status/')).map(x => ({ status: x.substr(7), color: links[x].metadata! }));
     }
 }
 
@@ -284,6 +285,7 @@ function parseContent(response: any) {
     return new ContentDto(response._links,
         response.id,
         response.status,
+        response.statusColor,
         DateTime.parseISO_UTC(response.created), response.createdBy,
         DateTime.parseISO_UTC(response.lastModified), response.lastModifiedBy,
         response.scheduleJob
diff --git a/src/Squidex/app/theme/_bootstrap.scss b/src/Squidex/app/theme/_bootstrap.scss
index 20f9b0077..e3bd858ca 100644
--- a/src/Squidex/app/theme/_bootstrap.scss
+++ b/src/Squidex/app/theme/_bootstrap.scss
@@ -304,6 +304,10 @@ a {
     }
 }
 
+.icon-sm {
+    font-size: 70%;
+}
+
 //
 // Button improvements
 //
diff --git a/tools/Migrate_01/OldEvents/ContentCreated.cs b/tools/Migrate_01/OldEvents/ContentCreated.cs
index 81bfc021b..26a443865 100644
--- a/tools/Migrate_01/OldEvents/ContentCreated.cs
+++ b/tools/Migrate_01/OldEvents/ContentCreated.cs
@@ -32,7 +32,7 @@ namespace Migrate_01.OldEvents
                 migrated.Status = Status.Draft;
             }
 
-            return this;
+            return migrated;
         }
     }
 }
diff --git a/tools/Migrate_01/OldEvents/ContentStatusChanged.cs b/tools/Migrate_01/OldEvents/ContentStatusChanged.cs
index 409255f8d..c2b732e31 100644
--- a/tools/Migrate_01/OldEvents/ContentStatusChanged.cs
+++ b/tools/Migrate_01/OldEvents/ContentStatusChanged.cs
@@ -41,7 +41,7 @@ namespace Migrate_01.OldEvents
                 migrated.Change = StatusChange.Change;
             }
 
-            return this;
+            return migrated;
         }
     }
 }
diff --git a/tools/Migrate_01/OldEvents/ContentStatusScheduled.cs b/tools/Migrate_01/OldEvents/ContentStatusScheduled.cs
deleted file mode 100644
index be965c854..000000000
--- a/tools/Migrate_01/OldEvents/ContentStatusScheduled.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschränkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-using System;
-using NodaTime;
-using Squidex.Domain.Apps.Core.Contents;
-using Squidex.Domain.Apps.Events.Contents;
-using Squidex.Infrastructure;
-using Squidex.Infrastructure.EventSourcing;
-using Squidex.Infrastructure.Reflection;
-using ContentStatusScheduledV2 = Squidex.Domain.Apps.Events.Contents.ContentStatusScheduled;
-
-namespace Migrate_01.OldEvents
-{
-    [EventType(nameof(ContentStatusScheduled))]
-    [Obsolete]
-    public sealed class ContentStatusScheduled : ContentEvent, IMigrated<IEvent>
-    {
-        public Status Status { get; set; }
-
-        public Instant DueTime { get; set; }
-
-        public IEvent Migrate()
-        {
-            var migrated = SimpleMapper.Map(this, new ContentStatusScheduledV2());
-
-            if (migrated.Status == default)
-            {
-                migrated.Status = Status.Draft;
-            }
-
-            return this;
-        }
-    }
-}