diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs
index 6cf376033..aea939d31 100644
--- a/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/GrainTextIndexer.cs
@@ -64,9 +64,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text
             var context = new SearchContext
             {
                 AppVersion = app.Version,
-                Schema = schema.SchemaDef,
+                AppLanguages = languages,
                 SchemaVersion = schema.Version,
-                Languages = languages,
                 IsDraft = useDraft
             };
 
diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs
index 628613c53..9c6a1ddad 100644
--- a/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/SearchContext.cs
@@ -6,7 +6,6 @@
 // ==========================================================================
 
 using System.Collections.Generic;
-using Squidex.Domain.Apps.Core.Schemas;
 
 namespace Squidex.Domain.Apps.Entities.Contents.Text
 {
@@ -18,6 +17,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text
 
         public long SchemaVersion { get; set; }
 
-        public List<string> Languages { get; set; }
+        public List<string> AppLanguages { get; set; }
     }
 }
diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs
index 852deca7e..58ea91fde 100644
--- a/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/Text/TextIndexerGrain.cs
@@ -186,7 +186,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text
         {
             if (queryParser == null || currentAppVersion != context.AppVersion || currentSchemaVersion != context.SchemaVersion)
             {
-                var fields = context.Languages.Select(BuildFieldName).ToArray();
+                var fields = context.AppLanguages.Select(BuildFieldName).ToArray();
 
                 queryParser = new MultiFieldQueryParser(Version, fields, Analyzer);
 
diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs
index 4d005609d..dd009aa55 100644
--- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs
+++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/TextIndexerGrainTests.cs
@@ -36,7 +36,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text
                 AppVersion = 1,
                 Schema = schema,
                 SchemaVersion = 1,
-                Languages = new List<string> { "de", "en" }
+                AppLanguages = new List<string> { "de", "en" }
             };
 
             sut = new TextIndexerGrain(assetStore);