diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs
index 20053510..7cd9d080 100644
--- a/MP.FileData/Controllers/FileController.cs
+++ b/MP.FileData/Controllers/FileController.cs
@@ -161,14 +161,14 @@ namespace MP.FileData.Controllers
             dbCtx.Dispose();
         }
 
-        public int FileCountFilt(string IdxMacchina, bool OnlyActive, bool OnlyMod, string FileName)
+        public int FileCountFilt(string IdxMacchina, bool OnlyActive, bool OnlyMod, string FileName, string Tag)
         {
             int answ = 0;
             using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
             {
                 answ = localDbCtx
                 .DbSetProgFile
-                .Where(x => (x.IdxMacchina == IdxMacchina || IdxMacchina == "0") && (x.Active == OnlyActive || !OnlyActive) && (!OnlyMod || x.DiskStatus != FileState.Ok) && (x.Path.Equals(FileName) || string.IsNullOrEmpty(FileName)))
+                .Where(x => (x.IdxMacchina == IdxMacchina || IdxMacchina == "0") && (x.Active == OnlyActive || !OnlyActive) && (!OnlyMod || x.DiskStatus != FileState.Ok) && (x.Path.Equals(FileName) || string.IsNullOrEmpty(FileName)) && (x.Tags.Where(t => t.TagId == Tag).Count() > 0 || string.IsNullOrEmpty(Tag)))
                 .Count();
             }
             return answ;
@@ -254,7 +254,7 @@ namespace MP.FileData.Controllers
             return dbResult;
         }
 
-        public List<DatabaseModels.FileModel> FileGetFilt(string IdxMacchina, bool OnlyActive, bool OnlyMod, int numStart, int numRecords, string fileName)
+        public List<DatabaseModels.FileModel> FileGetFilt(string IdxMacchina, bool OnlyActive, bool OnlyMod, string FileName, string Tag, int NumStart, int NumRecords)
         {
             List<DatabaseModels.FileModel> dbResult = new List<DatabaseModels.FileModel>();
             using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
@@ -263,10 +263,10 @@ namespace MP.FileData.Controllers
                 .DbSetProgFile
                 .Include(m => m.Macchina)
                 .Include(t => t.Tags)
-                .Where(x => (x.IdxMacchina == IdxMacchina || IdxMacchina == "0") && (x.Active == OnlyActive || !OnlyActive) && (!OnlyMod || x.DiskStatus != FileState.Ok) && (x.Path.Equals(fileName) || string.IsNullOrEmpty(fileName)))
+                .Where(x => (x.IdxMacchina == IdxMacchina || IdxMacchina == "0") && (x.Active == OnlyActive || !OnlyActive) && (!OnlyMod || x.DiskStatus != FileState.Ok) && (x.Path.Equals(FileName) || string.IsNullOrEmpty(FileName)) && (x.Tags.Where(t => t.TagId == Tag).Count() > 0 || string.IsNullOrEmpty(Tag)))
                 .OrderByDescending(x => x.LastMod)
-                .Skip(numStart)
-                .Take(numRecords)
+                .Skip(NumStart)
+                .Take(NumRecords)
                 .ToList();
             }
             return dbResult;
diff --git a/MP.Prog/Data/FileArchDataService.cs b/MP.Prog/Data/FileArchDataService.cs
index 2fd3aa1c..4dda1f72 100644
--- a/MP.Prog/Data/FileArchDataService.cs
+++ b/MP.Prog/Data/FileArchDataService.cs
@@ -222,7 +222,7 @@ namespace MP.Prog.Data
             int numCount = 0;
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();
-            numCount = dbController.FileCountFilt(CurrFilter.IdxMacchina, CurrFilter.OnlyActive, CurrFilter.OnlyMod, CurrFilter.FileName);
+            numCount = dbController.FileCountFilt(CurrFilter.IdxMacchina, CurrFilter.OnlyActive, CurrFilter.OnlyMod, CurrFilter.FileName, CurrFilter.Tag);
             stopWatch.Stop();
             TimeSpan ts = stopWatch.Elapsed;
             Log.Info($"Effettuata lettura da DB + caching per FileCountFilt: {ts.TotalMilliseconds} ms");
@@ -239,7 +239,7 @@ namespace MP.Prog.Data
             List<FileData.DatabaseModels.FileModel> dbResult = new List<FileData.DatabaseModels.FileModel>();
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();
-            dbResult = dbController.FileGetFilt(CurrFilter.IdxMacchina, CurrFilter.OnlyActive, CurrFilter.OnlyMod, CurrFilter.NumSkip, CurrFilter.PageSize, CurrFilter.FileName).ToList();
+            dbResult = dbController.FileGetFilt(CurrFilter.IdxMacchina, CurrFilter.OnlyActive, CurrFilter.OnlyMod, CurrFilter.FileName, CurrFilter.Tag, CurrFilter.NumSkip, CurrFilter.PageSize).ToList();
             //dbResult = dbController.FileGetFilt(CurrFilter.IdxMacchina, CurrFilter.OnlyActive, CurrFilter.OnlyMod, CurrFilter.FirstRecord, CurrFilter.PageSize * 10, CurrFilter.SearchVal).ToList();
             stopWatch.Stop();
             TimeSpan ts = stopWatch.Elapsed;