diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
index 60f3fd4873..b2c81307ff 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
@@ -969,7 +969,7 @@ internal class TagDao<T> : AbstractDao, ITagDao<T>
             tempTags = tempTags.Concat(_projectsQuery(filesDbContext, tenantId, subject));
         }
 
-        if (!deepSearch && parentFolder.FolderType != FolderType.VirtualRooms)
+        if (!deepSearch && parentFolder.RootFolderType != FolderType.VirtualRooms)
         {
             await foreach (var e in tempTags)
             {
@@ -1024,6 +1024,7 @@ internal class TagDao<T> : AbstractDao, ITagDao<T>
                 result = result.Concat(_newTagsForSBoxQuery(filesDbContext, tenantId, subject, thirdpartyFolderIds));
             }
         }
+
         if (parentFolder.FolderType == FolderType.VirtualRooms)
         {
             result = result.Concat(_newTagsThirdpartyRoomsQuery(filesDbContext, tenantId, subject));
diff --git a/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
index 6490176de6..e7808c362a 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
@@ -645,7 +645,7 @@ internal abstract class ThirdPartyProviderDao<T> : ThirdPartyProviderDao, IDispo
 
         var filesDbContext = _dbContextFactory.CreateDbContext();
         var entryIDs = await filesDbContext.ThirdpartyIdMapping
-                   .Where(r => r.Id.StartsWith(parentFolder.Id))
+                   .Where(r => r.Id.StartsWith(PathPrefix))
                    .Select(r => r.HashId)
                    .ToListAsync();
 
diff --git a/products/ASC.Files/Core/Utils/FileMarker.cs b/products/ASC.Files/Core/Utils/FileMarker.cs
index 109c21fd7c..a8ad125bc9 100644
--- a/products/ASC.Files/Core/Utils/FileMarker.cs
+++ b/products/ASC.Files/Core/Utils/FileMarker.cs
@@ -151,7 +151,7 @@ public class FileMarker
                     userEntriesData.Add(userID, entries);
                 }
 
-                RemoveFromCahce(projectsFolder, userID);
+                RemoveFromCahce(projectsFolder, userID);    
             });
         }
         else
@@ -813,6 +813,11 @@ public class FileMarker
             parentFolderTag.Id = -1;
         }
 
+        if (parent.FolderType != FolderType.VirtualRooms && parent.RootFolderType == FolderType.VirtualRooms && parent.ProviderEntry)
+        {
+            countSubNew = parentFolderTag.Count;
+        }
+
         if (parentFolderTag.Count != countSubNew)
         {
             if (countSubNew > 0)