diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index b62f6d4..b2fc252 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.317</Version>
+    <Version>2.7.10.319</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -42,3 +42,5 @@
 
 
 
+
+
diff --git a/WebWindowComplex/Window.cs b/WebWindowComplex/Window.cs
index b1d5fdc..07c8a8f 100644
--- a/WebWindowComplex/Window.cs
+++ b/WebWindowComplex/Window.cs
@@ -1218,7 +1218,7 @@ namespace WebWindowComplex
         {
             // Return "R"
             //return "CHAMFER";
-            return "RECTANGLE";
+            return "Rectangular";
         }
 
         internal OpeningTypes GetOpeningType(Openings OpeningType)
@@ -1333,9 +1333,25 @@ namespace WebWindowComplex
             m_HardwareList.Clear();
             string sSashShape = FindSashShape();
             string sOpeningType = ConvertOpeningType();
+            var iComp = StringComparison.InvariantCultureIgnoreCase;
+            var rawList = m_HardwareCompleteList
+                            .Where(x => x.Id == "000000" ||
+                                    (x.FamilyName.Equals(s_SelFamilyHW, iComp) && x.SashQty == nSashQty && x.Shape.Equals(sSashShape, iComp) && x.OpeningType.Equals(sOpeningType, iComp))
+                             )
+                            .ToList();
+            if (rawList != null && rawList.Count > 0)
+            {
+                m_HardwareList = new ObservableCollection<Hardware>(rawList);
+            }
+            else
+            {
+                m_HardwareList = new ObservableCollection<Hardware>();
+            }
+#if false
             m_HardwareList = new ObservableCollection<Hardware>(from Hardware in m_HardwareCompleteList
                                                                 where Hardware.Id == "000000" || (Hardware.FamilyName == s_SelFamilyHW && Hardware.SashQty == nSashQty && Hardware.Shape == sSashShape && Hardware.OpeningType == sOpeningType)
-                                                                select Hardware);
+                                                                select Hardware); 
+#endif
         }
 
         internal void RefreshHardwareOptionList()
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 43755c9..a7a3b34 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.317</Version>
+        <Version>2.7.10.319</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -41,3 +41,5 @@
 
 
 
+
+