diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 35794b8d05..2515036698 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-09 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* godmode/snmpconsole/snmp_alert.php: fixed the link to edit in the
+	button to edit, and fixed the free text filter.
+
 2013-08-08 Koichiro Kikuchi <koichiro@rworks.jp>
 
 	* index.php: Fixed footer layout probrems: Now we can see the
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index 91ff3d24fc..5f7fe3fe6e 100644
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -619,29 +619,27 @@ else {
 	}
 	
 	if (!empty($free_search)) {
-		$where_sql .= " AND (`single_value` = '" . $free_search . "'
-			OR `_snmp_f10_` = '" . $free_search . "'
-			OR `_snmp_f9_` = '" . $free_search . "'
-			OR `_snmp_f8_` = '" . $free_search . "'
-			OR `_snmp_f7_` = '" . $free_search . "'
-			OR `_snmp_f6_` = '" . $free_search . "'
-			OR `_snmp_f5_` = '" . $free_search . "'
-			OR `_snmp_f4_` = '" . $free_search . "'
-			OR `_snmp_f3_` = '" . $free_search . "'
-			OR `_snmp_f2_` = '" . $free_search . "'
-			OR `_snmp_f1_` = '" . $free_search . "'
-			OR `oid` = '" . $free_search . "'
-			OR `custom_oid` = '" . $free_search . "'
-			OR `agent` = '" . $free_search . "'
-			OR `description` = '" . $free_search . "')";
+		$where_sql .= " AND (`single_value` LIKE '%" . $free_search . "%'
+			OR `_snmp_f10_` LIKE '%" . $free_search . "%'
+			OR `_snmp_f9_` LIKE '%" . $free_search . "%'
+			OR `_snmp_f8_` LIKE '%" . $free_search . "%'
+			OR `_snmp_f7_` LIKE '%" . $free_search . "%'
+			OR `_snmp_f6_` LIKE '%" . $free_search . "%'
+			OR `_snmp_f5_` LIKE '%" . $free_search . "%'
+			OR `_snmp_f4_` LIKE '%" . $free_search . "%'
+			OR `_snmp_f3_` LIKE '%" . $free_search . "%'
+			OR `_snmp_f2_` LIKE '%" . $free_search . "%'
+			OR `_snmp_f1_` LIKE '%" . $free_search . "%'
+			OR `oid` LIKE '%" . $free_search . "%'
+			OR `custom_oid` LIKE '%" . $free_search . "%'
+			OR `agent` LIKE '%" . $free_search . "%'
+			OR `description` LIKE '%" . $free_search . "%')";
 	}
 	
 	$count = db_get_value_sql('SELECT COUNT(*)
 		FROM talert_snmp WHERE' . $where_sql);
 	
 	
-	
-	
 	$result = array();
 	
 	//Overview
@@ -723,7 +721,11 @@ else {
 			$data[7] = __('Never');
 		}
 		
-		$data[8] = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">' .
+		$data[8] = '<a href="index.php?' .
+			'sec=snmpconsole&' .
+			'sec2=godmode/snmpconsole/snmp_alert&' .
+			'update_alert=1&'.
+			'id_alert_snmp='.$row["id_as"].'">' .
 			html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>' .
 			'&nbsp;&nbsp;<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'">'  .
 			html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>';