diff --git a/controller.php b/controller.php
index 2b5c0de4c..d5ef0265f 100755
--- a/controller.php
+++ b/controller.php
@@ -104,7 +104,7 @@ if ($user->is_admin && string_contains($module['option'], '|select|')) {
 
 <script>
 function modificaColonne(button) {
-    openModal("'.tr('Modifica colonne').'", globals.rootdir + "/actions.php?id_module=" + globals.id_module + "&id_record=" + globals.id_record + "&op=aggiorna_colonne")
+    openModal("'.tr('Modifica colonne').'", globals.rootdir + "/actions.php?id_module=" + globals.id_module + "&op=aggiorna_colonne")
 }
 </script>';
 }
diff --git a/modules/aggiornamenti/src/Controlli/DatiFattureElettroniche.php b/modules/aggiornamenti/src/Controlli/DatiFattureElettroniche.php
index 62ad306a9..288c7b1f6 100644
--- a/modules/aggiornamenti/src/Controlli/DatiFattureElettroniche.php
+++ b/modules/aggiornamenti/src/Controlli/DatiFattureElettroniche.php
@@ -26,7 +26,7 @@ class DatiFattureElettroniche extends Controllo
 {
     public function getName()
     {
-        return tr('Corrispondeze Fatture Elettroniche XML e Fatture di vendita');
+        return tr('Corrispondenze XML FE e Documenti di vendita');
     }
 
     public function getType($record)
@@ -92,28 +92,26 @@ class DatiFattureElettroniche extends Controllo
                 ];
 
                 $riepilogo_anomalie = '
-                        <table class="table table-bordered table-condensed">
-                            <tr>
-                                <th>Sorgente</th>
-                                <th>P. Iva</th>
-                                <th>Cod. fiscale</th>
-                                <th>Totale</th>
-                            </tr>
+                            <div>
+                                <div class="col-md-3" style="background-color:#efefef;" >Sorgente</div>
+                                <div class="col-md-3" style="background-color:#efefef;" >P. Iva</div>
+                                <div class="col-md-3" style="background-color:#efefef;" >Cod. fiscale</div>
+                                <div class="col-md-3" style="background-color:#efefef;" >Totale</div>
+                            </div>
+                        
+                            <div>
+                                <div class="col-md-3" >XML</div>
+                                <div class="col-md-3" >'.$anomalia['piva_xml'].'</div>
+                                <div class="col-md-3" >'.$anomalia['codice_fiscale_xml'].'</div>
+                                <div class="col-md-3" >'.$anomalia['totale_documento_xml'].'</div>
+                            </div>
 
-                            <tr>
-                                <td>XML</td>
-                                <td>'.$anomalia['piva_xml'].'</td>
-                                <td>'.$anomalia['codice_fiscale_xml'].'</td>
-                                <td>'.$anomalia['totale_documento_xml'].'</td>
-                            </tr>
-
-                            <tr>
-                                <td>Gestionale</td>
-                                <td>'.$this->htmlDiff($anomalia['piva_xml'], $anomalia['piva']).'</td>
-                                <td>'.$this->htmlDiff($anomalia['codice_fiscale_xml'], $anomalia['codice_fiscale']).'</td>
-                                <td>'.$this->htmlDiff($anomalia['totale_documento_xml'], $anomalia['totale_documento']).'</td>
-                            </tr>
-                        </table>';
+                            <div>
+                                <div class="col-md-3">Gestionale</div>
+                                <div class="col-md-3">'.$this->htmlDiff($anomalia['piva_xml'], $anomalia['piva']).'</div>
+                                <div class="col-md-3">'.$this->htmlDiff($anomalia['codice_fiscale_xml'], $anomalia['codice_fiscale']).'</div>
+                                <div class="col-md-3">'.$this->htmlDiff($anomalia['totale_documento_xml'], $anomalia['totale_documento']).'</div>
+                            </div>';
 
                 $this->addResult([
                     'id' => $fattura_vendita->id,
diff --git a/modules/stato_servizi/actions.php b/modules/stato_servizi/actions.php
index 66eb0ac17..8f207da76 100755
--- a/modules/stato_servizi/actions.php
+++ b/modules/stato_servizi/actions.php
@@ -199,11 +199,15 @@ switch (filter('op')) {
         $history = (array) $informazioni['history'];
         foreach ($history as $key => $value) {
             $history[$key]['size'] = Filesystem::formatBytes($value['size']);
+            $history[$key]['invoices_size'] = Filesystem::formatBytes($value['invoices_size']);
+            $history[$key]['notifies_size'] = Filesystem::formatBytes($value['notifies_size']);
         }
 
         echo json_encode([
             'invoice_number' => $informazioni['invoice_number'],
             'size' => Filesystem::formatBytes($informazioni['size']),
+            'invoices_size' => Filesystem::formatBytes($informazioni['invoices_size']),
+            'notifies_size' => Filesystem::formatBytes($informazioni['notifies_size']),
             'history' => $history,
         ]);
         break;
diff --git a/modules/stato_servizi/edit.php b/modules/stato_servizi/edit.php
index d60400326..1450a6f25 100755
--- a/modules/stato_servizi/edit.php
+++ b/modules/stato_servizi/edit.php
@@ -105,8 +105,10 @@ if (Services::isEnabled()) {
                     <thead>
                         <tr>
                             <th>'.tr('Anno').'</th>
-                            <th>'.tr('Fatture transitate').'</th>
-                            <th>'.tr('Spazio occupato').'</th>
+                            <th>'.tr('Documenti transitati').'</th>
+                            <th>'.tr('Spazio fatture').'</th>
+                            <th>'.tr('Spazio ricevute').'</th>
+                            <th>'.tr('Spazio totale occupato').'</th>
                         </tr>
                     </thead>
 
@@ -114,6 +116,8 @@ if (Services::isEnabled()) {
                         <tr class="info">
                             <td>'.tr('Totale').'</td>
                             <td id="fe_numero"></td>
+                            <td id="fe_spazio_fatture"></td>
+                            <td id="fe_spazio_ricevute"></td>
                             <td id="fe_spazio"></td>
                         </tr>
                     </tbody>
@@ -133,6 +137,8 @@ if (Services::isEnabled()) {
                 },
                 success: function (response) {
                     $("#fe_numero").html(response.invoice_number);
+                    $("#fe_spazio_fatture").html(response.invoices_size);
+                    $("#fe_spazio_ricevute").html(response.notifies_size);
                     $("#fe_spazio").html(response.size);
 
                     if (response.history.length) {
@@ -142,6 +148,8 @@ if (Services::isEnabled()) {
                             $("#elenco-fe").append(`<tr>
                                 <td>` + data["year"] + `</td>
                                 <td>` + data["number"] + `</td>
+                                <td>` + data["invoices_size"] + `</td>
+                                <td>` + data["notifies_size"] + `</td>
                                 <td>` + data["size"] + `</td>
                             </tr>`);
                         }
diff --git a/src/HTMLBuilder/Handler/SelectHandler.php b/src/HTMLBuilder/Handler/SelectHandler.php
index 8297bc953..b38802c5a 100755
--- a/src/HTMLBuilder/Handler/SelectHandler.php
+++ b/src/HTMLBuilder/Handler/SelectHandler.php
@@ -158,13 +158,9 @@ class SelectHandler implements HandlerInterface
                 $attributes[] = 'style="background:'.$element['_bgcolor_'].'; color:'.color_inverse($element['_bgcolor_'].';"');
             }
 
-            $exclude = ['id', 'text'];
             // Leggo ulteriori campi oltre a id e descrizione per inserirli nell'option nella forma "data-nomecampo1", "data-nomecampo2", ecc
-            foreach ($element as $key => $value) {
-                if (!in_array($key, $exclude)) {
-                    $attributes[] = 'data-'.$key.'="'.prepareToField($value).'"';
-                }
-            }
+            unset($element['optgroup']);
+            $attributes[] = "data-select-attributes='".replace(json_encode($element), ["'" => "\'"])."'";
 
             $html .= '
         <option value="'.prepareToField($element['id']).'" '.implode(' ', $attributes).(!empty($element['disabled']) ? 'disabled' : '').'>'.$element['text'].'</option>';
diff --git a/update/2_4_23.sql b/update/2_4_23.sql
index 335eb5c64..0ab522e70 100644
--- a/update/2_4_23.sql
+++ b/update/2_4_23.sql
@@ -51,3 +51,6 @@ UPDATE `zz_widgets` SET `query` = 'SELECT\n CONCAT_WS(\' \', REPLACE(REPLACE(REP
 INSERT INTO `zz_api_resources` (`id`, `version`, `type`, `resource`, `class`, `enabled`) VALUES
 (NULL, 'v1', 'create', 'articolo', 'Modules\\Articoli\\API\\v1\\Articoli', '1'),
 (NULL, 'v1', 'update', 'articolo', 'Modules\\Articoli\\API\\v1\\Articoli', '1');
+
+-- Fix visualizzazione attività in dashboard
+UPDATE `zz_segments` SET `clause` = '(orario_inizio BETWEEN \'|period_start|\' AND \'|period_end|\' OR orario_fine BETWEEN \'|period_start|\' AND \'|period_end|\')' WHERE `zz_segments`.`name` = 'Attività';
\ No newline at end of file