diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 4bd2fbb5ac..188e756630 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-09  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_modules.php
+	include/functions_groups.php
+	include/javascript/pandora.js: Fix minor issues
+	in the select for time advanced control. Improve some
+	functions to use from metaconsole
+
 2012-08-09  Vanessa Gil <vanessa.gil@artica.es>
 
 	* godmode/reporting/reporting_builer.list_items.php
diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php
index fcb1548991..a1e5676781 100644
--- a/pandora_console/include/functions_groups.php
+++ b/pandora_console/include/functions_groups.php
@@ -470,7 +470,7 @@ function groups_get_groups_tree_recursive($groups, $parent = 0, $deep = 0) {
 	$return = array();
 
 	foreach ($groups as $key => $group) {
-		if (($key == 0) && ($parent == 0)) { //When the groups is the all group
+		if (($key === 0 || $key === __('All')) && ($parent === 0 || $parent === __('All'))) { //When the groups is the all group
 			$group['deep'] = $deep;
 			$group['hash_branch'] = true;
 			$deep ++;
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index c3c734ff77..785bed06bb 100644
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -686,6 +686,9 @@ function modules_get_agentmodule_kind($id_agentmodule) {
 		case 6:
 			return 'wmiserver';
 			break;
+		case 7:
+			return 'webserver';
+			break;
 		default:
 			return 'other';
 			break;
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index dc76ec0d8a..e49d303fc0 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -662,6 +662,8 @@ function period_select_init(name) {
 	// If the text input is empty, we put on it 5 minutes by default
 	if($('#text-'+name+'_text').val() == '') {
 		$('#text-'+name+'_text').val(300);
+		// Set the value in the hidden field too
+		$('.'+name).val(300);
 		if($('#'+name+'_select option:eq(0)').val() == 0) {
 			$('#'+name+'_select option:eq(2)').attr('selected', 'selected');
 		}
@@ -671,6 +673,8 @@ function period_select_init(name) {
 	}
 	else if($('#text-'+name+'_text').val() == 0) {
 		$('#'+name+'_units option:last').removeAttr('selected');
+		$('#'+name+'_manual').show();
+		$('#'+name+'_default').hide();
 	}
 
 }