diff --git a/MP-TAB3/Components/ControlsMan.razor b/MP-TAB3/Components/ControlsMan.razor
index 97f4ad5e..7709e613 100644
--- a/MP-TAB3/Components/ControlsMan.razor
+++ b/MP-TAB3/Components/ControlsMan.razor
@@ -28,7 +28,7 @@
             </div>
             <div class="col-6">
                 <div class="form-check form-switch fs-3">
-                    <input class="form-check-input" type="checkbox" @bind="@useOdl">
+                    <input class="form-check-input" type="checkbox" @bind="@UseOdl">
                     <label class="form-check-label">@selMessage</label>
                 </div>
             </div>
diff --git a/MP-TAB3/Components/ControlsMan.razor.cs b/MP-TAB3/Components/ControlsMan.razor.cs
index 0dde48ce..5a78327a 100644
--- a/MP-TAB3/Components/ControlsMan.razor.cs
+++ b/MP-TAB3/Components/ControlsMan.razor.cs
@@ -52,7 +52,9 @@ namespace MP_TAB3.Components
         }
 
         protected bool enableControlli { get; set; } = true;
+
         protected List<RegistroControlliModel> ListComplete { get; set; } = new List<RegistroControlliModel>();
+
         protected List<RegistroControlliModel> ListPaged { get; set; } = new List<RegistroControlliModel>();
 
         [Inject]
@@ -186,13 +188,21 @@ namespace MP_TAB3.Components
         #region Private Fields
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
+
         private bool isProcessing = false;
+
         private string noteKo = "";
+
         private int NumRecPage = 10;
+
         private int PageNum = 1;
+
         private bool showInsert = false;
+
         private bool showNote = false;
+
         private int TotalCount = 0;
+
         private bool useOdl = false;
 
         #endregion Private Fields
@@ -210,6 +220,19 @@ namespace MP_TAB3.Components
             get => useOdl ? "Periodo da ODL" : "Periodo Libero";
         }
 
+        private bool UseOdl
+        {
+            get => useOdl;
+            set
+            {
+                useOdl = value;
+                if (!value)
+                {
+                    IdxOdl = 0;
+                }
+            }
+        }
+
         #endregion Private Properties
     }
 }
\ No newline at end of file
diff --git a/MP-TAB3/Components/DeclarMan.razor b/MP-TAB3/Components/DeclarMan.razor
index 753b9c9e..cadac2f2 100644
--- a/MP-TAB3/Components/DeclarMan.razor
+++ b/MP-TAB3/Components/DeclarMan.razor
@@ -11,7 +11,7 @@
         </div>
         <div class="col-6">
             <div class="form-check form-switch fs-3">
-                <input class="form-check-input" type="checkbox" @bind="@useOdl">
+                <input class="form-check-input" type="checkbox" @bind="@UseOdl">
                 <label class="form-check-label">@selMessage</label>
             </div>
         </div>
diff --git a/MP-TAB3/Components/DeclarMan.razor.cs b/MP-TAB3/Components/DeclarMan.razor.cs
index 05c8f7a1..ca2d229c 100644
--- a/MP-TAB3/Components/DeclarMan.razor.cs
+++ b/MP-TAB3/Components/DeclarMan.razor.cs
@@ -156,7 +156,9 @@ namespace MP_TAB3.Components
         #region Private Properties
 
         private Periodo CurrPeriodo { get; set; } = new Periodo();
+
         private RegistroDichiarazioniModel? CurrRec { get; set; } = null;
+
         private string IdxMaccSel { get; set; } = "";
 
         private int IdxOdl { get; set; } = 0;
@@ -166,6 +168,19 @@ namespace MP_TAB3.Components
             get => useOdl ? "Periodo da ODL" : "Periodo Libero";
         }
 
+        private bool UseOdl
+        {
+            get => useOdl;
+            set
+            {
+                useOdl = value;
+                if (!value)
+                {
+                    IdxOdl = 0;
+                }
+            }
+        }
+
         #endregion Private Properties
     }
 }
\ No newline at end of file
diff --git a/MP-TAB3/Components/ScrapMan.razor b/MP-TAB3/Components/ScrapMan.razor
index 8b27c012..34e19143 100644
--- a/MP-TAB3/Components/ScrapMan.razor
+++ b/MP-TAB3/Components/ScrapMan.razor
@@ -21,7 +21,7 @@
         </div>
         <div class="col-6">
             <div class="form-check form-switch fs-3">
-                <input class="form-check-input" type="checkbox" @bind="@useOdl">
+                <input class="form-check-input" type="checkbox" @bind="@UseOdl">
                 <label class="form-check-label">@selMessage</label>
             </div>
         </div>
diff --git a/MP-TAB3/Components/ScrapMan.razor.cs b/MP-TAB3/Components/ScrapMan.razor.cs
index de7c088a..fc309996 100644
--- a/MP-TAB3/Components/ScrapMan.razor.cs
+++ b/MP-TAB3/Components/ScrapMan.razor.cs
@@ -200,6 +200,19 @@ namespace MP_TAB3.Components
             get => useOdl ? "Periodo da ODL" : "Periodo Libero";
         }
 
+        private bool UseOdl
+        {
+            get => useOdl;
+            set
+            {
+                useOdl = value;
+                if (!value)
+                {
+                    IdxOdl = 0;
+                }
+            }
+        }
+
         #endregion Private Properties
     }
 }
\ No newline at end of file
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 72ec7ae5..7b85624a 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1915</Version>
+      <Version>6.16.2312.1916</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 8412ba83..0ef2868e 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1915</h4>
+    <h4>Versione: 6.16.2312.1916</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 83057c07..4b41cbcd 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1915
+6.16.2312.1916
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index cc4429f6..dd26dfec 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1915</version>
+  <version>6.16.2312.1916</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>