diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 603afe9c90..680d6e3ce9 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -4094,10 +4094,8 @@ function visual_map_get_layout_status($layout_id, $status_data=[], $depth=0)
                         );
                     } else if (!empty($layout_item_data['id_agent'])) {
                         // Agent.
-                        $agent_status = agents_get_status(
-                            $layout_item_data['id_agent'],
-                            true
-                        );
+                        $agent = db_get_row('tagente', 'id_agente', $layout_item_data['id_agent']);
+                        $agent_status = agents_get_status_from_counts($agent);
                         $status = visual_map_translate_agent_status(
                             $agent_status
                         );
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 90da456ae1..5cf5121e55 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -1394,6 +1394,9 @@ function visual_map_editor_print_hack_translate_strings()
 <script type="text/javascript">
 $(document).ready (function () {
     $("#map_linked").change(function () {
+        $("option[value=" + this.value + "]", this)
+        .attr("selected", true).siblings()
+        .removeAttr("selected")
         $("#text-agent").val("");
         $("input[name=id_agent]").val(0);
         $("#module").empty();