diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs
index 4bdb3edf..5ce7d7d8 100644
--- a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs
+++ b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs
@@ -352,7 +352,8 @@ namespace BotSharp.Core.Repository
 
             if (filter.Type != null)
             {
-                query = query.Where(x => x.Type == filter.Type);
+                var types = filter.Type.Split(",");
+                query = query.Where(x => types.Contains(x.Type));
             }
 
             if (filter.IsPublic.HasValue)
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs
index b974f681..ba31f6ae 100644
--- a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs
+++ b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs
@@ -284,7 +284,8 @@ public partial class MongoRepository
 
         if (filter.Type != null)
         {
-            filters.Add(builder.Eq(x => x.Type, filter.Type));
+            var types = filter.Type.Split(",");
+            filters.Add(builder.In(x => x.Type, types));
         }
 
         if (filter.IsPublic.HasValue)