diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 8246309..df4bcbb 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -242,8 +242,6 @@ namespace WebWindowComplex
             get => m_ItemTableList;
         }
 
-        protected string? m_CurrJwd { get; set; }
-
         protected string m_SelSVG { get; set; } = "";
 
         /// <summary>
@@ -264,10 +262,8 @@ namespace WebWindowComplex
             get => m_SashList;
         }
 
-        protected string SelFamilyHardware { get; set; } = "";
-
         protected string SelColorMaterial { get; set; } = "";
-
+        protected string SelFamilyHardware { get; set; } = "";
         protected string SelGlass { get; set; } = "";
 
         protected string SelMaterial { get; set; } = ""!;
@@ -623,7 +619,7 @@ namespace WebWindowComplex
             if (string.IsNullOrEmpty(LiveData.CurrJwd))
                 WindowFromJson = JsonConvert.DeserializeObject<JsonWindow>(m_SelTemplate.JWD, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
             else
-                WindowFromJson = JsonConvert.DeserializeObject<JsonWindow>(m_CurrJwd!, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
+                WindowFromJson = JsonConvert.DeserializeObject<JsonWindow>(LiveData.CurrJwd!, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
             if (m_CurrWindow != null)
             {
                 m_CurrWindow.OnPreview -= M_CurrWindow_OnPreview;
@@ -687,12 +683,15 @@ namespace WebWindowComplex
                     // SOLO SE modificato live data...
                     if (prevLiveData == null || !prevLiveData.Equals(LiveData))
                     {
-                        prevLiveData = LiveData;
-                        m_CurrJwd = LiveData.CurrJwd;
+                        prevLiveData = new LivePayload()
+                        {
+                            CurrJwd = LiveData.CurrJwd,
+                            SvgPreview = LiveData.SvgPreview
+                        };
                         m_SelSVG = LiveData.SvgPreview;
                         // Aggiornati parametri di ingresso selezionati
                         UpdateSelParameter();
-                        JsonWindow WindowFromJson = JsonConvert.DeserializeObject<JsonWindow>(m_CurrJwd, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
+                        JsonWindow WindowFromJson = JsonConvert.DeserializeObject<JsonWindow>(LiveData.CurrJwd, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
                         setCurrWindow(WindowFromJson);
                         //SOLO SE non sono in edit...
                         if (!editLock)
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 98340f2..5da86c0 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>2.7.10.816</Version>
+    <Version>2.7.10.818</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -126,6 +126,11 @@
 
 
 
+
+
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 04401d3..7df8926 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>2.7.10.817</Version>
+        <Version>2.7.10.818</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -158,6 +158,11 @@
 
 
 
+
+
+
+
+