diff --git a/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceGridBySGXML.php b/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceGridBySGXML.php
index 02fde068741..a37840a1961 100644
--- a/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceGridBySGXML.php
+++ b/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceGridBySGXML.php
@@ -117,9 +117,10 @@
     if ($hSearch != ""){
         $query .= "AND h.name like '%" . $hSearch . "%' ";
     }
-    
+
+    /* Servicegroup search */    
     if ($sgSearch != ""){
-        $query .= "AND sg.name like '%" . $sgSearch . "%' ";
+        $query .= "AND sg.name like '" . $sgSearch . "' ";
     }
 
     /* Service search */
@@ -155,6 +156,9 @@
         }
         $sg_search .= implode(" OR ", $servicegroupsSql1);
         $sg_search .= ") ";
+        if ($sgSearch != ""){
+            $sg_search .= "AND sg.name like '" . $sgSearch . "' ";
+        }
     }
 
     /** ***************************************************
diff --git a/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceSummaryBySGXML.php b/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceSummaryBySGXML.php
index a6597e3387f..e5669233f83 100644
--- a/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceSummaryBySGXML.php
+++ b/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceSummaryBySGXML.php
@@ -118,8 +118,9 @@
         $query .= "AND h.name like '%" . $hSearch . "%' ";
     }
     
+    /* Servicegroup search */
     if ($sgSearch != ""){
-        $query .= "OR sg.name like '%" . $sgSearch . "%' ";
+        $query .= "AND sg.name like '" . $sgSearch . "' ";
     }
 
     /* Service search */
@@ -156,6 +157,9 @@
         }
         $sg_search .= implode(" OR ", $servicegroupsSql1);
         $sg_search .= ") ";
+        if ($sgSearch != ""){
+            $sg_search .= "AND sg.name like '" . $sgSearch . "' ";
+        }
     }
 
     /** ***************************************************