diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
index e1967ce..a9db601 100644
--- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
+++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
@@ -8,7 +8,7 @@ Public Class InputExpanderVM
 #Region "FIELDS & PROPERTIES"
 
    ' Variabile temporanea per salvare bShow
-   Private m_tmpbShow As Boolean
+   Private m_bTempShow As Boolean
 
    Private m_tmpInfoList As New ObservableCollection(Of InfoItem)
    ''' <summary>
@@ -178,7 +178,7 @@ Public Class InputExpanderVM
          Return m_ComboSelectedIndex
       End Get
       Set(value As Integer)
-         If m_tmpbShow Then Map.refProjectVM.SetLastInteger(value)
+         If m_bTempShow Then Map.refProjectVM.SetLastInteger(value)
          m_ComboSelectedIndex = value
          ' Assegno l'indice selezionato ad una variabile temporanea per utilizzarlo quando rimuovo l'info dalla lista
          Dim tmpComboSelectedIndex As Integer = ComboSelectedIndex
@@ -396,10 +396,10 @@ Public Class InputExpanderVM
          TextBlock = PrepareInputBoxParam.sLabel
          TextBox = ""
          TextVisibility = Visibility.Visible
-         ' Controllo se il titolo è uguale a INFO se si
-         If Title = EgtMsg(5359).ToUpper() Then
+         ' Controllo se il titolo è uguale a INFO  !!! DA CAMBIARE !!!
+         If Title = "INFO" Then
             ' Metto tmpbShow a false
-            m_tmpbShow = False
+            m_bTempShow = False
             ' Rendo visibile il pulsante che mostra la lista delle info
             ShowInfoItemVisibility = Visibility.Visible
             ' Rendo visibile la lista delle info selezionate
@@ -420,7 +420,7 @@ Public Class InputExpanderVM
       End If
       If PrepareInputBoxParam.bShowCombo Then
          ' Assegno a tmpbShow PrepareInputBoxParam.bShowCombo
-         m_tmpbShow = PrepareInputBoxParam.bShowCombo
+         m_bTempShow = PrepareInputBoxParam.bShowCombo
          ' Pulisco la lista ComboItemsList
          ComboItemsList.Clear()
          ' Pulisco la lista tmpInfoList
@@ -496,12 +496,12 @@ Public Class InputExpanderVM
    ''' Funzione che popola la lista ComboItemsList
    ''' </summary>
    Private Sub ComboInfo()
-      Dim sVal As String() = Nothing
-      EgtGetAllInfo(Map.refManageLayerExpanderVM.RightClickedTreeItemId, sVal)
+      Dim vsVal As String() = Nothing
+      EgtGetAllInfo(Map.refManageLayerExpanderVM.RightClickedTreeItemId, vsVal)
 
-      Dim Ind As Integer = 0
-      If Not m_tmpbShow Then
-         For Each Item As String In sVal
+      If Not m_bTempShow And Not IsNothing( vsVal) Then
+         Dim Ind As Integer = 0
+         For Each Item As String In vsVal
             Dim sSplitItem As String() = Item.Split("="c)
             tmpInfoList.Add(New InfoItem(Ind, sSplitItem(0), sSplitItem(1)))
             Ind += 1