diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 3d5b1d91d5..b77188a023 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -3144,7 +3144,7 @@ $class = 'databox filters';
                 'agent_os_filter[]',
                 $selected_agent_os_filter,
                 '',
-                'All',
+                __('All'),
                 '0',
                 false,
                 true
@@ -3198,8 +3198,8 @@ $class = 'databox filters';
                         'agent_status_filter[]',
                         $selected_agent_status_filter,
                         '',
-                        false,
-                        '',
+                        __('All'),
+                        '-1',
                         false,
                         true,
                         false,
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index ffbd08eec3..65daf41679 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2297,7 +2297,7 @@ function reporting_agents_inventory($report, $content)
         $search_sql .= ' AND id_os = '.$es_custom_fields;
     }
 
-    if ($es_os_filter != '') {
+    if (in_array('0', $es_os_filter) === false) {
         $search_sql .= ' AND id_os IN ('.implode(',', $es_os_filter).')';
     }
 
@@ -2394,7 +2394,7 @@ function reporting_agents_inventory($report, $content)
             }
 
             if (array_search('estado', $es_agents_inventory_display_options) !== false) {
-                if (in_array(agents_get_status($value['id_agente']), $es_agent_status_filter)) {
+                if (in_array('-1', $es_agent_status_filter) === true || in_array(agents_get_status($value['id_agente']), $es_agent_status_filter)) {
                     $agents[$key]['estado'] = agents_get_status($value['id_agente']);
                 } else {
                     // Agent does not match status filter.