diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoDirectory.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoDirectory.cs
index d861fd8c3..d6606f46f 100644
--- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoDirectory.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoDirectory.cs
@@ -98,7 +98,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.FullText
         {
             EnsureNotDisposed();
 
-            var file = FindFile(name) ?? throw new FileNotFoundException();
+            var file = FindFile(name) ?? throw new FileNotFoundException(null, GetFullName(name));
 
             return file.Length;
         }
diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoIndexStorage.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoIndexStorage.cs
index b9781f871..c5a81a42d 100644
--- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoIndexStorage.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoIndexStorage.cs
@@ -27,9 +27,9 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.FullText
             this.bucket = bucket;
         }
 
-        public Task<LuceneDirectory> CreateDirectoryAsync(Guid schemaId)
+        public Task<LuceneDirectory> CreateDirectoryAsync(Guid ownerId)
         {
-            var folderName = schemaId.ToString();
+            var folderName = ownerId.ToString();
 
             var tempFolder = Path.Combine(Path.GetTempPath(), "Indices", folderName);
             var tempDirectory = new DirectoryInfo(tempFolder);
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/IndexManager.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/IndexManager.cs
index ae3b707f8..82de5a132 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/IndexManager.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/IndexManager.cs
@@ -45,7 +45,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text.Lucene
             return indexStorage.ClearAsync();
         }
 
-        public async Task<IIndex> AcquireAsync(Guid schemaId)
+        public async Task<IIndex> AcquireAsync(Guid ownerId)
         {
             IndexHolder? indexHolder;
 
@@ -53,24 +53,24 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text.Lucene
             {
                 await lockObject.WaitAsync();
 
-                if (indices.TryGetValue(schemaId, out indexHolder))
+                if (indices.TryGetValue(ownerId, out indexHolder))
                 {
                     log.LogWarning(w => w
                         .WriteProperty("message", "Unreleased index found.")
-                        .WriteProperty("schemaId", schemaId.ToString()));
+                        .WriteProperty("ownerId", ownerId.ToString()));
 
                     await CommitInternalAsync(indexHolder, true);
                 }
 
-                indexHolder = new IndexHolder(schemaId);
-                indices[schemaId] = indexHolder;
+                indexHolder = new IndexHolder(ownerId);
+                indices[ownerId] = indexHolder;
             }
             finally
             {
                 lockObject.Release();
             }
 
-            var directory = await indexStorage.CreateDirectoryAsync(schemaId);
+            var directory = await indexStorage.CreateDirectoryAsync(ownerId);
 
             indexHolder.Open(directory);
 
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/FileIndexStorage.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/FileIndexStorage.cs
index 489092cc2..31482f852 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/FileIndexStorage.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/FileIndexStorage.cs
@@ -16,9 +16,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text.Lucene.Storage
 {
     public sealed class FileIndexStorage : IIndexStorage
     {
-        public Task<LuceneDirectory> CreateDirectoryAsync(Guid schemaId)
+        public Task<LuceneDirectory> CreateDirectoryAsync(Guid ownerId)
         {
-            var folderName = $"Indexes/{schemaId}";
+            var folderName = $"Indexes/{ownerId}";
             var folderPath = Path.Combine(Path.GetTempPath(), folderName);
 
             return Task.FromResult<LuceneDirectory>(FSDirectory.Open(folderPath));
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/IIndexStorage.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/IIndexStorage.cs
index b88caa993..edfab22bc 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/IIndexStorage.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Lucene/Storage/IIndexStorage.cs
@@ -14,7 +14,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text.Lucene
 {
     public interface IIndexStorage
     {
-        Task<Directory> CreateDirectoryAsync(Guid schemaId);
+        Task<Directory> CreateDirectoryAsync(Guid ownerId);
 
         Task ClearAsync();