diff --git a/MP-TAB-SERV/Components/ProdStopMan.razor b/MP-TAB-SERV/Components/ProdStopMan.razor
index 5ec229f9..f9cfd433 100644
--- a/MP-TAB-SERV/Components/ProdStopMan.razor
+++ b/MP-TAB-SERV/Components/ProdStopMan.razor
@@ -3,7 +3,7 @@
         <div class="card-body text-light">
             <i class="@objIcon" style="font-size: 8vw"></i>
         </div>
-        <div class="card-footer text-center bg-dark text-light opacity-50">
+        <div class="card-footer text-center bg-dark text-light opacity-50 p-1">
             <span class="text-nowrap text-center" style="font-size: .9rem;">@objTxt</span>
         </div>
     </div>
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 6aaef35d..1589510b 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-	  <Version>6.16.2310.608</Version>
+	  <Version>6.16.2310.609</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/ProdStop.razor b/MP-TAB-SERV/Pages/ProdStop.razor
index c91e88af..db29a88a 100644
--- a/MP-TAB-SERV/Pages/ProdStop.razor
+++ b/MP-TAB-SERV/Pages/ProdStop.razor
@@ -20,7 +20,7 @@ else
     <div class="d-flex justify-content-between flex-wrap align-items-center mb-3">
     @foreach(var item in events2show)
     {
-        <ProdStopMan objCss="@item.CssClass" objIcon="@item.Icon" objTxt="@(item.Nome.Split(" - ")[1])"></ProdStopMan>  
+        <ProdStopMan objCss="@item.CssClass" objIcon="@item.Icon" objTxt="@item.Label"></ProdStopMan>
     }
     </div>
 }
diff --git a/MP-TAB-SERV/Pages/ProdStop.razor.cs b/MP-TAB-SERV/Pages/ProdStop.razor.cs
index c8695340..51dbcf8c 100644
--- a/MP-TAB-SERV/Pages/ProdStop.razor.cs
+++ b/MP-TAB-SERV/Pages/ProdStop.razor.cs
@@ -40,13 +40,13 @@ namespace MP_TAB_SERV.Pages
                 {
                     CurrMSE = await MsgServ.GetMachineMse(IdxMacc);
                 }
+                var eventsAll = await TabSrv.AnagEventiGetAll(IdxMacc);
+                if (eventsAll != null)
+                {
+                    events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x => x.Label).ToList();
+                }
             }
 
-            var eventsAll = await TabSrv.AnagEventiGetAll();
-            if(eventsAll != null)
-            {
-                events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x=>x.Nome).ToList();
-            }
         }
 
         #endregion Private Methods
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index fab5472c..0e9adc94 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2310.608</h4>
+    <h4>Versione: 6.16.2310.609</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index bf165561..191a6abe 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2310.608
+6.16.2310.609
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 514f9dc9..eb46eef9 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2310.608</version>
+  <version>6.16.2310.609</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs
index 94cf865e..a0add837 100644
--- a/MP.Data/Controllers/MpTabController.cs
+++ b/MP.Data/Controllers/MpTabController.cs
@@ -6,6 +6,7 @@ using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace MP.Data.Controllers
 {
@@ -27,15 +28,19 @@ namespace MP.Data.Controllers
         /// Restituisce l'anagrafica eventi per intero
         /// </summary>
         /// <returns></returns>
-        public List<AnagEventiModel> AnagEventiGetAll()
+        public List<AnagEventiModel> AnagEventiGetAll(string IdxMac)
         {
             List<AnagEventiModel> dbResult = new List<AnagEventiModel>();
             using (var dbCtx = new MoonProContext(_configuration))
             {
+                var IdxMacch = new SqlParameter("@idxMacchina", IdxMac);
+
                 dbResult = dbCtx
-                    .DbSetAnagEventi
-                    .AsNoTracking()
-                    .ToList();
+                           .DbSetAnagEventi
+                           .FromSqlRaw("exec dbo.stp_vseb_getByIdxMacchinaFull @idxMacchina", IdxMacch)
+                           .AsNoTracking()
+                           .AsEnumerable()
+                           .ToList();
             }
             return dbResult;
         }
diff --git a/MP.Data/DatabaseModels/AnagEventiModel.cs b/MP.Data/DatabaseModels/AnagEventiModel.cs
index 99c04d3e..b197394a 100644
--- a/MP.Data/DatabaseModels/AnagEventiModel.cs
+++ b/MP.Data/DatabaseModels/AnagEventiModel.cs
@@ -13,12 +13,8 @@ namespace MP.Data.DatabaseModels
     {
         [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int IdxTipo { get; set; } = 0;
-        public string Nome { get; set; } = "";
-        public string TabAzione { get; set; } = "";
-        public string Azione { get; set; } = "";
-        public string KeyEvento { get; set; } = "";
+        public string Label { get; set; } = "";
         public bool EventoTablet { get; set; } = true;
-        public string NoteEvento { get; set; } = "";
         public string CssClass { get; set; } = "";
         public string Icon { get; set; } = "";
     }
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index 2e0a3dc4..b7ed1ff4 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -52,7 +52,7 @@ namespace MP.Data.Services
 
         #region Public Methods
 
-        public async Task<List<AnagEventiModel>> AnagEventiGetAll()
+        public async Task<List<AnagEventiModel>> AnagEventiGetAll(string IdxMacch)
         {
             // setup parametri costanti
             DateTime startDate = new DateTime(2000, 1, 1);
@@ -62,7 +62,7 @@ namespace MP.Data.Services
             sw.Start();
             List<AnagEventiModel>? result = new List<AnagEventiModel>();
             // cerco in redis...
-            string currKey = $"{redisBaseKey}:AnagEventi";
+            string currKey = $"{redisBaseKey}:AnagEventi:{IdxMacch}";
             RedisValue rawData = await redisDb.StringGetAsync(currKey);
             if (!string.IsNullOrEmpty($"{rawData}"))
             {
@@ -71,7 +71,7 @@ namespace MP.Data.Services
             }
             else
             {
-                result = dbTabController.AnagEventiGetAll();
+                result = dbTabController.AnagEventiGetAll(IdxMacch);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
                 await redisDb.StringSetAsync(currKey, rawData, LongCache);
