diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs
index d53ce54e2..79660a929 100644
--- a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs
@@ -39,7 +39,6 @@ namespace Squidex.Domain.Apps.Entities.Contents
         private readonly IContentVersionLoader contentVersionLoader;
         private readonly IAppProvider appProvider;
         private readonly IScriptEngine scriptEngine;
-        private readonly ITagService tagService;
         private readonly EdmModelBuilder modelBuilder;
 
         public ContentQueryService(
@@ -47,7 +46,6 @@ namespace Squidex.Domain.Apps.Entities.Contents
             IContentRepository contentRepository,
             IContentVersionLoader contentVersionLoader,
             IScriptEngine scriptEngine,
-            ITagService tagService,
             EdmModelBuilder modelBuilder)
         {
             Guard.NotNull(appProvider, nameof(appProvider));
@@ -55,14 +53,12 @@ namespace Squidex.Domain.Apps.Entities.Contents
             Guard.NotNull(contentVersionLoader, nameof(contentVersionLoader));
             Guard.NotNull(modelBuilder, nameof(modelBuilder));
             Guard.NotNull(scriptEngine, nameof(scriptEngine));
-            Guard.NotNull(tagService, nameof(tagService));
 
             this.appProvider = appProvider;
             this.contentRepository = contentRepository;
             this.contentVersionLoader = contentVersionLoader;
             this.modelBuilder = modelBuilder;
             this.scriptEngine = scriptEngine;
-            this.tagService = tagService;
         }
 
         public Task ThrowIfSchemaNotExistsAsync(ContentQueryContext context)
@@ -215,11 +211,6 @@ namespace Squidex.Domain.Apps.Entities.Contents
 
                     var result = model.ParseQuery(query).ToQuery();
 
-                    if (result.Filter != null)
-                    {
-                        result.Filter = FilterTagTransformer.Transform(result.Filter, context.App.Id, tagService);
-                    }
-
                     if (result.Sort.Count == 0)
                     {
                         result.Sort.Add(new SortNode(new List<string> { "lastModified" }, SortOrder.Descending));
diff --git a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs
index aa3746811..fd5b9a343 100644
--- a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs
@@ -34,15 +34,15 @@ namespace Squidex.Domain.Apps.Entities.Contents.State
         [JsonProperty]
         public ScheduleJob ScheduleJob { get; set; }
 
-        [JsonProperty]
-        public Status Status { get; set; }
-
         [JsonProperty]
         public bool IsPending { get; set; }
 
         [JsonProperty]
         public bool IsDeleted { get; set; }
 
+        [JsonProperty]
+        public Status Status { get; set; }
+
         protected void On(ContentCreated @event)
         {
             SimpleMapper.Map(@event, this);
diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs
index f7fe49b17..ff04b55ca 100644
--- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs
+++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs
@@ -38,7 +38,6 @@ namespace Squidex.Domain.Apps.Entities.Contents
         private readonly ISchemaEntity schema = A.Fake<ISchemaEntity>();
         private readonly IAppEntity app = A.Fake<IAppEntity>();
         private readonly IAppProvider appProvider = A.Fake<IAppProvider>();
-        private readonly ITagService tagService = A.Fake<ITagService>();
         private readonly Guid appId = Guid.NewGuid();
         private readonly Guid schemaId = Guid.NewGuid();
         private readonly string appName = "my-app";
@@ -62,7 +61,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
 
             context = new ContentQueryContext(QueryContext.Create(app, user));
 
-            sut = new ContentQueryService(appProvider, contentRepository, contentVersionLoader, scriptEngine, tagService, modelBuilder);
+            sut = new ContentQueryService(appProvider, contentRepository, contentVersionLoader, scriptEngine, modelBuilder);
         }
 
         [Fact]