diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 434c79fbc4..041053c2be 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -1295,10 +1295,10 @@ class DiscoveryTaskList extends HTML
             echo '<span>';
             echo __('Please select devices to be monitored');
             echo '</span><div class="manage">';
-            echo '<button onclick="$(\'.sim-tree li a\').each(function(){simTree_tree.doCheck($(this), false); simTree_tree.clickNode($(this));});">';
+            echo '<button onclick="$(\'.sim-tree li:not(.disabled) a\').each(function(){simTree_tree.doCheck($(this), false); simTree_tree.clickNode($(this));});">';
             echo __('select all');
             echo '</button>';
-            echo '<button onclick="$(\'.sim-tree li a\').each(function(){simTree_tree.doCheck($(this), true); simTree_tree.clickNode($(this));});">';
+            echo '<button onclick="$(\'.sim-tree li:not(.disabled) a\').each(function(){simTree_tree.doCheck($(this), true); simTree_tree.clickNode($(this));});">';
             echo __('deselect all');
             echo '</button>';
             echo '<button onclick="$(\'.sim-tree-spread.sim-icon-r\').click();">';
@@ -1343,9 +1343,21 @@ class DiscoveryTaskList extends HTML
             $ids = array_reduce(
                 $selection,
                 function ($carry, $item) use (&$n_agents) {
-                    if (explode('-', $item['id'])[1] === null) {
-                        // String is agent-module.
-                        $n_agents++;
+                    // String is agent-module.
+                    $fields = explode('-', $item['id']);
+                    $agent_name = $fields[0];
+                    $module_name = $fields[1];
+                    if ($module_name === null) {
+                        // Do not count if already created.
+                        if (db_get_value(
+                            'id_agente',
+                            'tagente',
+                            'nombre',
+                            io_safe_input($agent_name)
+                        ) === false
+                        ) {
+                            $n_agents++;
+                        }
                     }
 
                     $carry[] = $item['id'];
@@ -1411,7 +1423,9 @@ class DiscoveryTaskList extends HTML
                                 $data['modules'][$module_name]['checked'] = 1;
                             } else {
                                 if ($data['modules'][$module_name]['checked'] == 1) {
-                                    $summary[] = '<li class="removed">'.__('Removed').' '.$agent_name.' - '.$module_name.'</li>';
+                                    if ($module_name != 'Host Alive') {
+                                        $summary[] = '<li class="removed">'.__('Removed').' '.$agent_name.' - '.$module_name.'</li>';
+                                    }
                                 }
 
                                 $data['modules'][$module_name]['checked'] = 0;
diff --git a/pandora_console/include/styles/task_list.css b/pandora_console/include/styles/task_list.css
index 1b29103cfd..01f7a82549 100644
--- a/pandora_console/include/styles/task_list.css
+++ b/pandora_console/include/styles/task_list.css
@@ -57,10 +57,15 @@ div.subtitle div.manage button {
   font-size: 1.2em;
   font-family: "lato", "Open Sans", sans-serif;
   display: inline-block;
-  padding: 5px;
   margin-right: 1em;
   cursor: pointer;
   text-align: left;
+  border-radius: 21px;
+  box-shadow: 0 0 10px -5px #888;
+  padding: 0.5em 1em;
+  border: 1px solid #ddd;
+  user-select: none;
+  color: #424242;
 }
 
 div.subtitle .link.review {
@@ -100,3 +105,8 @@ span.link {
 span.link.review {
   font-weight: bold;
 }
+
+#review {
+  padding-top: 2em;
+  padding-left: 6.7em;
+}
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index c781d6b9fb..96777fe158 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -6275,6 +6275,10 @@ sub notification_get_users {
 		',
 		safe_input($source)
 	);
+
+	@results = map { $_->{'id_user'} } @results;
+
+	return @results;
 }
 
 ##########################################################################
@@ -6296,6 +6300,10 @@ sub notification_get_groups {
 		',
 		safe_input($source)
 	);
+
+	@results = map { $_->{'id_group'} } @results;
+
+	return @results;
 }