diff --git a/products/ASC.Files/Client/src/components/DragTooltip/DragTooltip.js b/products/ASC.Files/Client/src/components/DragTooltip/DragTooltip.js
index 9bf91e28ba..97e024ec5e 100644
--- a/products/ASC.Files/Client/src/components/DragTooltip/DragTooltip.js
+++ b/products/ASC.Files/Client/src/components/DragTooltip/DragTooltip.js
@@ -7,7 +7,7 @@ import { Base } from "@appserver/components/themes";
 const StyledTooltip = styled.div`
   position: fixed;
   padding: 8px;
-  z-index: 150;
+  z-index: 250;
   background: ${(props) => props.theme.filesDragTooltip.background};
   border-radius: 6px;
   font-size: 15px;
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
index 4834764de2..a4ff4ae004 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
@@ -188,7 +188,7 @@ namespace ASC.Files.Core.Data
             }
         }
 
-        public ValueTask<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
+        public Task<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
         {
             var q = GetQuery(r => subjects.Contains(r.Subject));
             return FromQueryAsync(q);
@@ -383,12 +383,15 @@ namespace ASC.Files.Core.Data
             return q;
         }
 
-        protected ValueTask<List<FileShareRecord>> FromQueryAsync(IQueryable<DbFilesSecurity> filesSecurities)
+        protected async Task<List<FileShareRecord>> FromQueryAsync(IQueryable<DbFilesSecurity> filesSecurities)
         {
-            return filesSecurities
-                .AsAsyncEnumerable()
-                .SelectAwait(async e => await ToFileShareRecordAsync(e))
-                .ToListAsync();
+            var data = await filesSecurities.ToListAsync();
+            var result = new List<FileShareRecord>();
+            foreach (var file in data)
+            {
+                result.Add(await ToFileShareRecordAsync(file));
+            }
+            return result;
         }
 
         private async Task<FileShareRecord> ToFileShareRecordAsync(DbFilesSecurity r)
diff --git a/products/ASC.Files/Core/Core/Security/ISecurityDao.cs b/products/ASC.Files/Core/Core/Security/ISecurityDao.cs
index 1863c314f9..82b18ce022 100644
--- a/products/ASC.Files/Core/Core/Security/ISecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Security/ISecurityDao.cs
@@ -37,7 +37,7 @@ namespace ASC.Files.Core.Security
     {
         Task SetShareAsync(FileShareRecord r);
 
-        ValueTask<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects);
+        Task<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects);
 
         Task<IEnumerable<FileShareRecord>> GetSharesAsync(IEnumerable<FileEntry<T>> entry);
 
diff --git a/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
index 22130ed29a..55d1175659 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
@@ -367,10 +367,10 @@ namespace ASC.Files.Thirdparty
             return Task.CompletedTask;
         }
 
-        public ValueTask<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
+        public Task<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
         {
             List<FileShareRecord> result = null;
-            return new ValueTask<List<FileShareRecord>>(result);
+            return Task<List<FileShareRecord>>.FromResult(result);
         }
 
         public Task<IEnumerable<FileShareRecord>> GetSharesAsync(IEnumerable<FileEntry<string>> entry)
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
index 34ea3d3dea..b02997ee67 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
@@ -440,7 +440,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
         {
             var selector = GetSelector(file.ID);
             var fileDao = selector.GetFileDao(file.ID);
-            return UseTrashForRemove(file);
+            return fileDao.UseTrashForRemove(file);
         }
 
         #region chunking
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
index 4dbb81548e..e7e1824397 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
@@ -190,7 +190,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
             return SecurityDao.RemoveSubjectAsync(subject);
         }
 
-        public ValueTask<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
+        public Task<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
         {
             return SecurityDao.GetSharesAsync(subjects);
         }