diff --git a/backend/src/Migrations/Migrations/MongoDb/ConvertDocumentIds.cs b/backend/src/Migrations/Migrations/MongoDb/ConvertDocumentIds.cs
index 3e4be3116..5b24967ff 100644
--- a/backend/src/Migrations/Migrations/MongoDb/ConvertDocumentIds.cs
+++ b/backend/src/Migrations/Migrations/MongoDb/ConvertDocumentIds.cs
@@ -116,10 +116,7 @@ namespace Migrations.Migrations.MongoDb
                     document["id"] = documentIdOld;
                     document["_id"] = documentIdNew;
 
-                    if (extraAction != null)
-                    {
-                        extraAction(document);
-                    }
+                    extraAction?.Invoke(document);
 
                     var filter = Builders<BsonDocument>.Filter.Eq("_id", documentIdNew);
 
diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/MongoDbQueryTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/MongoDbQueryTests.cs
index d13da211a..d224396b6 100644
--- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/MongoDbQueryTests.cs
+++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/MongoDbQueryTests.cs
@@ -327,7 +327,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.MongoDb
         private string _Q(ClrQuery query)
         {
             var rendered =
-                query.AdjustToModel(schemaDef).BuildFilter<MongoContentEntity>()!
+                query.AdjustToModel(schemaDef).BuildFilter<MongoContentEntity>().Filter!
                     .Render(Serializer, Registry).ToString();
 
             return rendered;