diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs
index 0c09e1398..12e1f3262 100644
--- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs
+++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs
@@ -9,7 +9,6 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.OData.UriParser;
-using MongoDB.Bson;
 using MongoDB.Driver;
 using Squidex.Domain.Apps.Core.Contents;
 using Squidex.Domain.Apps.Core.Schemas;
@@ -80,17 +79,13 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors
                 filters.Add(filter);
             }
 
-            if (filters.Count > 1)
-            {
-                return Filter.And(filters);
-            }
-            else if (filters.Count == 1)
+            if (filters.Count == 1)
             {
                 return filters[0];
             }
             else
             {
-                return new BsonDocument();
+                return Filter.And(filters);
             }
         }
     }
diff --git a/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs
index bc61b97b7..936c5fb4f 100644
--- a/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs
+++ b/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs
@@ -11,7 +11,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using FakeItEasy;
 using Squidex.Infrastructure.EventSourcing;
-using Squidex.Infrastructure.Log;
 using Squidex.Infrastructure.States;
 using Squidex.Infrastructure.Tasks;
 using Squidex.Infrastructure.TestHelpers;
diff --git a/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs
index d547ca046..ba200ce52 100644
--- a/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs
+++ b/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs
@@ -12,7 +12,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using FakeItEasy;
 using Squidex.Infrastructure.EventSourcing;
-using Squidex.Infrastructure.Log;
 using Squidex.Infrastructure.States;
 using Squidex.Infrastructure.TestHelpers;
 using Xunit;
diff --git a/tools/Migrate_01/Migration01_FromCqrs.cs b/tools/Migrate_01/Migration01_FromCqrs.cs
index e632f9077..16230e653 100644
--- a/tools/Migrate_01/Migration01_FromCqrs.cs
+++ b/tools/Migrate_01/Migration01_FromCqrs.cs
@@ -12,7 +12,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Domain.Apps.Entities.Apps;
-using Squidex.Domain.Apps.Entities.Apps.State;
 using Squidex.Domain.Apps.Entities.Assets;
 using Squidex.Domain.Apps.Entities.Contents.State;
 using Squidex.Domain.Apps.Entities.Rules;