diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor
index 853c8941..6d7f846b 100644
--- a/MP.Stats/Components/SelectionFilter.razor
+++ b/MP.Stats/Components/SelectionFilter.razor
@@ -33,7 +33,7 @@
                 </div>
                 <div class="col">
                     <label for="idxMacc" class="small">macchina:</label>
-                    <div class="input-group input-group-sm">
+                    <div class="input-group input-group-sm" style="min-width: 15rem;">
                         <select @bind="@IdxMacchina" class="form-select">
                             @foreach (var item in ddlMacchine)
                             {
@@ -58,53 +58,53 @@
                         </div>
                     </div>
                 }
-                <div class="col">
-                    <div class="form-group mb-0">
-                        <div class="input-group input-group-sm">
-                            <div class="input-group-prepend">
-                                <label class="input-group-text">commessa:</label>
-                            </div>
-                            <input class="form-control form-control-sm" @bind="@SearchCom" placeholder="search (> @minChar char)" disabled="@(!CommessaEnabled)" />
-                        </div>
-                        @if (!string.IsNullOrEmpty(SearchCom) && SearchCom.Length >= minChar)
-                        {
+                <div class="col" style="min-width: 10rem;">
+                    @if (!OnlyEnergy)
+                    {
+                        <div class="form-group mb-0">
                             <div class="input-group input-group-sm">
-                                <select @bind="@KeyRichiesta" class="form-select" disabled="@(!CommessaEnabled)">
-                                    @foreach (var item in ddlCommesse)
-                                    {
-                                        <option value="@item.ValueField">@item.LabelField</option>
-                                    }
-                                </select>
+                                <div class="input-group-prepend">
+                                    <label class="input-group-text">commessa:</label>
+                                </div>
+                                <input class="form-control form-control-sm" @bind="@SearchCom" placeholder="search (> @minChar char)" disabled="@(!CommessaEnabled)" />
                             </div>
-                            @* <InputSelect @bind-Value="@KeyRichiesta" id="KeyRich" class="form-control form-control-sm" title="Macchina" disabled="@(!CommessaEnabled)">
-                                @foreach (var item in ddlCommesse)
-                                {
-                                    <option value="@item.ValueField">@item.LabelField</option>
-                                }
-                            </InputSelect> *@
-                        }
-                    </div>
+                            @if (!string.IsNullOrEmpty(SearchCom) && SearchCom.Length >= minChar)
+                            {
+                                <div class="input-group input-group-sm">
+                                    <select @bind="@KeyRichiesta" class="form-select" disabled="@(!CommessaEnabled)">
+                                        @foreach (var item in ddlCommesse)
+                                        {
+                                            <option value="@item.ValueField">@item.LabelField</option>
+                                        }
+                                    </select>
+                                </div>
+                            }
+                        </div>
+                    }
                 </div>
-                <div class="col">
-                    <div class="form-group mb-0">
-                        <div class="input-group input-group-sm">
-                            <div class="input-group-prepend">
-                                <label class="input-group-text">articolo:</label>
-                            </div>
-                            <input class="form-control form-control-sm" @bind="@SearchArt" placeholder="search (> @minChar char)" />
-                        </div>
-                        @if (!string.IsNullOrEmpty(SearchArt) && SearchArt.Length >= minChar)
-                        {
+                <div class="col" style="min-width: 10rem;">
+                    @if (!OnlyEnergy)
+                    {
+                        <div class="form-group mb-0">
                             <div class="input-group input-group-sm">
-                                <select @bind="@CodArticolo" class="form-select">
-                                    @foreach (var item in ddlArticoli)
-                                    {
-                                        <option value="@item.ValueField">@item.LabelField</option>
-                                    }
-                                </select>
+                                <div class="input-group-prepend">
+                                    <label class="input-group-text">articolo:</label>
+                                </div>
+                                <input class="form-control form-control-sm" @bind="@SearchArt" placeholder="search (> @minChar char)" />
                             </div>
-                        }
-                    </div>
+                            @if (!string.IsNullOrEmpty(SearchArt) && SearchArt.Length >= minChar)
+                            {
+                                <div class="input-group input-group-sm">
+                                    <select @bind="@CodArticolo" class="form-select">
+                                        @foreach (var item in ddlArticoli)
+                                        {
+                                            <option value="@item.ValueField">@item.LabelField</option>
+                                        }
+                                    </select>
+                                </div>
+                            }
+                        </div>
+                    }
                 </div>
             </div>
         </div>
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index 0b0befa8..02488d62 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.16.2507.0315</Version>
-        <Version>6.16.2507.0315</Version>
+        <Version>6.16.2507.0318</Version>
+        <Version>6.16.2507.0318</Version>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591</NoWarn>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index 168f1c8c..d1dae0ff 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.16.2507.0315</h4>
+    <h4>Versione: 6.16.2507.0318</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 73d542ab..97418fc2 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2507.0315
+6.16.2507.0318
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index d86e0fa7..322add68 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2507.0315</version>
+  <version>6.16.2507.0318</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>