--- a/include/db/servicealert-dao.inc.php
+++ b/include/db/servicealert-dao.inc.php
@@ -15,7 +15,7 @@
 
 function getCurrentAlerts() {
 		global $conn;
-	$query = "SELECT * from servicealerts_alerts";
+	$query = 'SELECT * from servicealerts_alerts where NOW() > start and NOW() < "end"';
 	//debug($query, "database");
 	$query = $conn->prepare($query);
 	//if ($stop_sequence != "") $query->bindParam(":stop_sequence", $stop_sequence);
@@ -31,14 +31,20 @@
 		global $conn;
 	$query = "SELECT * from servicealerts_informed where servicealert_id = :servicealert_id";
 	
-	if ($filter_class != "" && $filter_id != "") {
-		$query .= " AND (informed_class = :informed_class OR informed_class = 'network') AND informed_id = :informed_id";
+	if ($filter_class != "" ) {
+		$query .= " AND informed_class = :informed_class  ";
+	
+	}
+		if ($filter_id != "") {
+		$query .= " AND informed_id = :informed_id ";
 	
 	}
 	//debug($query, "database");
 	$query = $conn->prepare($query);
-	if ($filter_class != "" && $filter_id != "") {
+	if ($filter_class != "" ) {
 		$query->bindParam(":informed_class", $filter_class);
+	}
+		if ($filter_id != "") {
 		$query->bindParam(":informed_id", $filter_id);
 	}
 	$query->bindParam(":servicealert_id", $id);