diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php
index 91045ce0ea..25d9d297c5 100644
--- a/pandora_console/godmode/events/event_edit_filter.php
+++ b/pandora_console/godmode/events/event_edit_filter.php
@@ -438,8 +438,12 @@ $table->data[10][1] = html_print_select(
     true
 );
 
-$repeated_sel[0] = __('All events');
-$repeated_sel[1] = __('Group events');
+$repeated_sel = [
+    EVENT_GROUP_REP_ALL      => __('All events'),
+    EVENT_GROUP_REP_EVENTS   => __('Group events'),
+    EVENT_GROUP_REP_AGENTS   => __('Group agents'),
+    EVENT_GROUP_REP_EXTRAIDS => __('Group extra id'),
+];
 $table->data[11][0] = '<b>'.__('Repeated').'</b>';
 $table->data[11][1] = html_print_select(
     $repeated_sel,
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 8935f78995..52d6c49f98 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -5190,6 +5190,14 @@ function events_get_sql_order($sort_field='timestamp', $sort='DESC', $group_rep=
             $sort_field_translated = 'id_extra';
         break;
 
+        case 'agent_name':
+            $sort_field_translated = 'ta.nombre';
+        break;
+
+        case 'module_custom_id':
+            $sort_field_translated = 'am.custom_id';
+        break;
+
         default:
             $sort_field_translated = $sort_field;
         break;
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 281cb6d57b..50d565756d 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -356,6 +356,10 @@ if (is_ajax() === true) {
                             $order['field'] = 'agent_name';
                         break;
 
+                        case 'if(te.ack_utimestamp > 0, from_unixtime(te.ack_utimestamp),"") as ack_utimestamp':
+                            $order['field'] = 'ack_utimestamp';
+                        break;
+
                         default:
                             $order['field'] = $field;
                         break;