diff --git a/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb b/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb
index d2dd0134..6a8d1248 100644
--- a/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb
@@ -1,6 +1,6 @@
 Public Module ConstDataGridColumnsIni
 
-   Public Const OPTIMIZERDATAGRIDCOLUMNS_FILE_NAME As String = "OPTIMIZERDataGridColumns.ini"
+   Public Const OPTIMIZERDATAGRIDCOLUMNS_FILE_NAME As String = "OPTIMIZERDataGridColumns.json"
 
    Public Const S_OPENPROJFILEDLG_PROD As String = "DG_OpenProjectFileDialog_PROD"
    Public Const S_NEWOPENPROJFILEDLG_PROD As String = "DG_NewOpenProjectFileDialog_PROD"
diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
index 557076cb..b5b388b1 100644
--- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
@@ -38,5 +38,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.1.5")>
-<Assembly: AssemblyFileVersion("3.1.1.5")>
+<Assembly: AssemblyVersion("3.1.1.6")>
+<Assembly: AssemblyFileVersion("3.1.1.6")>
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
index d9e89436..47768e4e 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
@@ -579,7 +579,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
    Protected Sub LoadColumns()
       ' carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
       ' carico campi su cui eseguire il filtro di ricerca
       m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
       m_SelBTLDateType = BTLDateTypes.CREATEDATE
@@ -595,7 +595,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
    Friend Function VerifySelected() As Boolean
       ' Salvo modifiche a colonne
-      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
       If IsNothing(SelProject) Then Return False
       Dim AllFilesInDir As IEnumerable(Of String) = Nothing
       If m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
index 459581af..506843b5 100644
--- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
@@ -445,7 +445,7 @@ Public MustInherit Class OpenProjectFileDialogVM
 
    Protected Sub LoadColumns()
       ' carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPENPROJFILEDLG_PROD, ProjectColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_OPENPROJFILEDLG_PROD, ProjectColumns)
       ' carico campi su cui eseguire il filtro di ricerca
       m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
       m_SelBTLDateType = BTLDateTypes.CREATEDATE
@@ -461,7 +461,7 @@ Public MustInherit Class OpenProjectFileDialogVM
 
    Friend Function VerifySelected() As Boolean
       ' Salvo modifiche a colonne
-      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPENPROJFILEDLG_PROD, ProjectColumns)
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_OPENPROJFILEDLG_PROD, ProjectColumns)
       If IsNothing(SelProject) Then Return False
       Dim AllFilesInDir As IEnumerable(Of String) = Nothing
       If m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
index 96447e82..52c2ddec 100644
--- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.1.5")]
-[assembly: AssemblyFileVersion("3.1.1.5")]
+[assembly: AssemblyVersion("3.1.1.6")]
+[assembly: AssemblyFileVersion("3.1.1.6")]
diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
index 28df3b9d..c57a1b1b 100644
--- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
@@ -739,7 +739,7 @@ Public Class BTLDataWndVM
       End If
    End Sub
 
-   Friend Sub SaveInfoBTL()
+   Friend Sub SaveInfoBTL(nType As BWType)
       Dim AISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(nType, True)
       Dim sDefaultConfigFile As String = String.Empty
       Dim sTmpStrategySetup As String = String.Empty
@@ -813,7 +813,7 @@ Public Class BTLDataWndVM
             Return
          End If
       Else
-         SaveInfoBTL()
+         SaveInfoBTL(ProjectManagerVM.CurrProd.nType)
       End If
       Map.refLeftPanelVM.ResetCalc()
       Map.refSceneHostVM.SaveProject()
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
index b2c47f87..012cab2d 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
@@ -821,7 +821,7 @@ Public Class ListGenericParameter
          Return m_SelValue
       End Get
       Set(value As ToolParameter)
-         If Not IsNothing(value) Then
+         If Not IsNothing(value) AndAlso Not IsNothing(m_SelValue) Then
             If m_SelValue.sUUID <> value.sUUID Then
                Map.refStrategyManagerVM.SetbIsModifyStrategy(True)
                SetbIsListModify(True)
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
index 55afef78..7aa157da 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
@@ -52,8 +52,8 @@
                                      Style="{StaticResource BTLPartList_Expander}">
                               <Expander.Header>
                                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
-                                    <TextBlock Text="{Binding Path=Name}" 
-                                               Style="{StaticResource BTLPartList_TextBlock}"/>
+                                    <!--<TextBlock Text="{Binding Path=Name}" 
+                                               Style="{StaticResource BTLPartList_TextBlock}"/>-->
                                     <TextBlock Text="{Binding Path=Name, Converter={StaticResource ProjIdToBtlFileName}}"
                                                Style="{StaticResource BTLPartList_TextBlock}"/>
                                     <Button Command="{Binding Tag.Data_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb
index c61ac873..b183aeff 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb
@@ -197,7 +197,7 @@ Public Class BTLPartListVM
       Map.SetRefPartListVM(Me)
 
       ' carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTLIST, PartColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_PARTLIST, PartColumns)
       m_colPart_Do = PartColumns.FirstOrDefault(Function(x) x.Key = COL_DO)
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb
index 4048280c..e46e6ec0 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb
@@ -64,7 +64,7 @@ Public Class FeatureInPartInRawPartListVM
       Map.SetRefFeatureInPartInRawPartListVM(Me)
 
       ' carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_FEATUREINPARTINRAWPARTLIST, FeatureInPartInRawPartColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_FEATUREINPARTINRAWPARTLIST, FeatureInPartInRawPartColumns)
       m_colFeatureInPartInRawPart_Do = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_DO)
       m_colFeatureInPartInRawPart_Priority = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_PRIORITY)
    End Sub
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb
index 0f799768..0e1d8133 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb
@@ -111,7 +111,7 @@ Public Class PParameterListVM
       Map.SetRefPParameterListVM(Me)
 
       ' carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARAMETERLIST_P, PParameterListColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_PARAMETERLIST_P, PParameterListColumns)
 
       ' recupero riferimento a colonna Value
       m_colPParam_Value = PParameterListColumns.FirstOrDefault(Function(x) x.Key = COL_VALUE)
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
index cc6b086e..35d44376 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
@@ -225,14 +225,14 @@ Public Class RawPartListVM
    Friend Sub UpdateColumns(nProjectType As BWType)
       If nProjectType = BWType.BEAM Then
          ' carico le colonne della datagrid
-         EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_BEAM, RawPartColumns)
+         EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_RAWPARTLIST_BEAM, RawPartColumns)
          ' carico le colonne della datagrid
-         EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
+         EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
       ElseIf nProjectType = BWType.WALL Then
          ' carico le colonne della datagrid
-         EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_WALL, RawPartColumns)
+         EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_RAWPARTLIST_WALL, RawPartColumns)
          ' carico le colonne della datagrid
-         EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns)
+         EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns)
       End If
       NotifyPropertyChanged(NameOf(RawPartColumns))
       NotifyPropertyChanged(NameOf(PartInRawPartColumns))
diff --git a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb
index a6a2df40..b5eb6f13 100644
--- a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb
@@ -421,7 +421,7 @@ Public Class MainWindowVM
                                                                                                                            {S_PARTINRAWPARTLIST_BEAM, Map.refRawPartListVM.PartInRawPartColumns},
                                                                                                                            {S_FEATUREINPARTINRAWPARTLIST, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns},
                                                                                                                            {S_PARAMETERLIST_P, Map.refPParameterListVM.PParameterListColumns}}
-      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), DataGridColumnDictionary)
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary)
       ' Termino il Model
       m_MainWindowM.Close()
       ' Termino il programma
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index 28d492de..5302b466 100644
--- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("3.1.1.5")>
-<Assembly: AssemblyFileVersion("3.1.1.5")>
+<Assembly: AssemblyVersion("3.1.1.6")>
+<Assembly: AssemblyFileVersion("3.1.1.6")>
diff --git a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
index 42531497..ff4fe84e 100644
--- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
@@ -686,7 +686,7 @@ Public Class ProdManagerVM
 
       m_BTLDataWnd = New BTLDataWndVM(nType)
       m_BTLDataWnd.Read(nProjId, nType)
-      m_BTLDataWnd.SaveInfoBTL()
+      m_BTLDataWnd.SaveInfoBTL(nType)
 
       ' Controllo se effettuare import + verifica
       If Map.refConfigurationPageVM.bVerifyImportBTL_IsChecked Then
@@ -698,13 +698,13 @@ Public Class ProdManagerVM
       LoadingWndHelper.UpdateLoadingWnd(ActiveIds.IMPORTBTL, 2, EgtMsg(63005), 50, 70)          ' Loading parts
       ' leggo struttura BTL per liste
       Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0))
-      CopyBuilding()
       ' aggiorno Db
       Dim ExportDate As DateTime
       Dim sBTLFileName As String = Path.GetFileNameWithoutExtension(sImportFilePath)
       DateTime.TryParse(Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPDATE & " " &
       Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPTIME, ExportDate)
       DbControllers.m_ProjController.UpdateInfo(nProjId, sBTLFileName, sBTLFileName, Map.refProjectVM.BTLStructureVM.sLISTNAME, ExportDate, nType, Machine.Name)
+      CopyBuilding()
       ' se progetto pareti e vista ruotata
       If nType = BWType.WALL AndAlso (CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE) Then
          ' ruoto le pareti di 180 per raddrizzarle rispetto alla vista
@@ -837,7 +837,7 @@ Public Class ProdManagerVM
 
       m_BTLDataWnd = New BTLDataWndVM(nType)
       m_BTLDataWnd.Read(nProjId, nType)
-      m_BTLDataWnd.SaveInfoBTL()
+      m_BTLDataWnd.SaveInfoBTL(nType)
 
       ' Controllo se effettuare import + verifica
       If Map.refConfigurationPageVM.bVerifyImportBTL_IsChecked Then
@@ -988,7 +988,7 @@ Public Class ProdManagerVM
 
       m_BTLDataWnd = New BTLDataWndVM(nType)
       m_BTLDataWnd.Read(nProjId, nType)
-      m_BTLDataWnd.SaveInfoBTL()
+      m_BTLDataWnd.SaveInfoBTL(nType)
 
       ' leggo struttura BTL per liste
       Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0))
diff --git a/EgtBEAMWALL.Optimizer/Statistics/StatisticsVM.vb b/EgtBEAMWALL.Optimizer/Statistics/StatisticsVM.vb
index 0b03f05e..1fa23d04 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/StatisticsVM.vb
+++ b/EgtBEAMWALL.Optimizer/Statistics/StatisticsVM.vb
@@ -291,9 +291,9 @@ Public Class StatisticsVM
       Map.SetRefStatisticsVM(Me)
 
       'carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_STATISTICS, StatisticsColumns)
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPTIMIZERSTATISTICS, OptimizerStatisticsColumns)
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTSTATISTICS, RawPartStatisticsColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_STATISTICS, StatisticsColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_OPTIMIZERSTATISTICS, OptimizerStatisticsColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_RAWPARTSTATISTICS, RawPartStatisticsColumns)
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -395,7 +395,7 @@ Public Class StatisticsVM
       Dim DataGridColumnDictionary As New Dictionary(Of String, ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)) From {{S_STATISTICS, StatisticsColumns},
                                                                                                                            {S_OPTIMIZERSTATISTICS, OptimizerStatisticsColumns},
                                                                                                                            {S_RAWPARTSTATISTICS, RawPartStatisticsColumns}}
-      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), DataGridColumnDictionary)
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary)
       ' Chiudo finestra senza fare niente
       RaiseEvent m_CloseWindow(False)
    End Sub
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
index 6bdb444a..48851bea 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
@@ -1688,7 +1688,7 @@ Public Class ListStrategyParameter
          Return m_SelValue
       End Get
       Set(value As ToolParameter)
-         If Not IsNothing(value) Then
+         If Not IsNothing(value) AndAlso Not IsNothing(m_SelValue) Then
             If m_SelValue.sUUID <> value.sUUID Then
                Map.refStrategyManagerVM.SetbIsModifyStrategy(True)
                SetbIsListModify(True)
diff --git a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndVM.vb b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndVM.vb
index 7286a5e4..87ab0bfb 100644
--- a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndVM.vb
@@ -96,7 +96,7 @@ Public Class UpdateBTLWndVM
 
    Sub New(InputBTLPartList As List(Of BTLPartToUpdate))
       ' carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_UPDATEBTLPARTLIST, UpdateBTLColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_UPDATEBTLPARTLIST, UpdateBTLColumns)
       ' carica la lista dei Part importati
       BTLPartList = New ObservableCollection(Of BTLPartToUpdate)(InputBTLPartList)
    End Sub
@@ -117,7 +117,7 @@ Public Class UpdateBTLWndVM
    End Property
 
    Public Sub Ok()
-      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_UPDATEBTLPARTLIST, UpdateBTLColumns)
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_UPDATEBTLPARTLIST, UpdateBTLColumns)
       RaiseEvent m_CloseWindow(True)
    End Sub
 
diff --git a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb
index c1931f0b..2f78dc2d 100644
--- a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb
+++ b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb
@@ -392,7 +392,7 @@ Public Class ConfigurationPageVM
       Next
       ' carico la lista delle colonne delle variabili della macchina in ConfigurationPage
       'GetPrivateProfileColumns(S_VARIABLESLIST, VariablesColumns)
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_VARIABLESLIST, VariablesColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_VARIABLESLIST, VariablesColumns)
       ' carico le Variables della macchina
       LoadVariables()
       ' leggo SectionTime e PartTime
diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListVM.vb b/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListVM.vb
index 3cb94701..5df2d50a 100644
--- a/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListVM.vb
+++ b/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListVM.vb
@@ -57,7 +57,7 @@ Public Class FeatureInPartInRawPartListVM
       ' creo riferimento in Map
       Map.SetRefFeatureInPartInRawPartListVM(Me)
       ' carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR, FeatureInPartInRawPartColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR, FeatureInPartInRawPartColumns)
       ' recupero riferimento a colonna Redo
       m_colFeatureInPartInRawPart_Redo = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_REDO)
    End Sub
diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb b/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb
index 2a23c9c4..24a518b4 100644
--- a/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb
+++ b/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb
@@ -134,7 +134,7 @@ Public Class PartInRawPartListVM
       '' aggiungo riferimento a map
       Map.SetRefPartInRawPartListVM(Me)
       ' carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTINRAWPARTLIST_SUPERVISOR, PartInRawPartColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_PARTINRAWPARTLIST_SUPERVISOR, PartInRawPartColumns)
       ' recupero riferimento a colonna Redo
       m_colPartInRawPart_Redo = PartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_REDO)
       ' recupero riferimento a colonne Offset, Rot, Flip, PosX, PosY
diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb
index d573a609..9875130e 100644
--- a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb
+++ b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb
@@ -110,7 +110,7 @@ Public Class RawPartListVM
       ' Aggiungo riferimento a Map
       Map.SetRefRawPartListVM(Me)
       ' carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_SUPERVISOR, RawPartColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_RAWPARTLIST_SUPERVISOR, RawPartColumns)
       ' recupero riferimento a colonna StartCut e PosZ
       m_colRawPart_StartCut = m_RawPartColumns.FirstOrDefault(Function(x) x.Key = COL_STARTCUT)
       m_colRawPart_PosZ = m_RawPartColumns.FirstOrDefault(Function(x) x.Key = COL_POSZ)
diff --git a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageVM.vb b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageVM.vb
index 67081257..791e752c 100644
--- a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageVM.vb
+++ b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageVM.vb
@@ -97,7 +97,7 @@ Public Class MDIPageVM
       ' imposto riferimento in Map
       Map.SetRefMDIPageVM(Me)
       ' carico le colonne della datagrid
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_MDICOMMANDS, MDICommandColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_MDICOMMANDS, MDICommandColumns)
       ' leggo stringhe MDI
       GetPrivateProfileMDICommands(S_MDI, MDICommandList)
       m_MDIResultTimer.Interval = TimeSpan.FromMilliseconds(2000)
diff --git a/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageVM.vb b/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageVM.vb
index b591565a..b74f54e2 100644
--- a/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageVM.vb
+++ b/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageVM.vb
@@ -266,7 +266,7 @@ Public Class MachineLogPageVM
       Map.SetRefMachineLogPageVM(Me)
       ' carico le colonne della datagrid
       'GetPrivateProfileColumns(S_MACHINELOG, MachineLogColumns)
-      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_MACHINELOG, MachineLogColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_MACHINELOG, MachineLogColumns)
       m_MachineLogList_View = CollectionViewSource.GetDefaultView(m_MachineLogList)
       m_MachineLogList_View.Filter = AddressOf MachineLogFilter
       ' recupero riferimento a colonna StartCut
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
index b2bf8305..dc60bf07 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
@@ -215,7 +215,7 @@ Public Class MainWindowVM
                                                                                                                            {S_VARIABLESLIST, Map.refConfigurationPageVM.VariablesColumns},
                                                                                                                            {S_MACHINELOG, Map.refMachineLogPageVM.MachineLogColumns},
                                                                                                                            {S_MDICOMMANDS, Map.refMDIPageVM.MDICommandColumns}}
-      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), DataGridColumnDictionary)
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary)
       ' Termino il Model
       MainWindowM.Close()
       ' Chiudo la finestra principale del programma
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index b190e0ba..ba3ee12b 100644
--- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.1.5")>
-<Assembly: AssemblyFileVersion("3.1.1.5")>
+<Assembly: AssemblyVersion("3.1.1.6")>
+<Assembly: AssemblyFileVersion("3.1.1.6")>