diff --git a/datamodel/itop-config-mgmt-1.0.0/contacts_menu.xml b/datamodel/itop-config-mgmt-1.0.0/contacts_menu.xml
index 7a7db016f4..3575ecccef 100644
--- a/datamodel/itop-config-mgmt-1.0.0/contacts_menu.xml
+++ b/datamodel/itop-config-mgmt-1.0.0/contacts_menu.xml
@@ -23,7 +23,7 @@
       <dashlet id="4" xsi:type="DashletGroupByPie">
         <title>UI-ContactsMenu-ContactsByLocation</title>
         <query>SELECT Contact</query>
-        <group_by>location_name</group_by>
+        <group_by>location_id</group_by>
         <style>pie</style>
       </dashlet>
     </cell>
diff --git a/datamodel/itop-incident-mgmt-1.0.0/incident-dashboard.xml b/datamodel/itop-incident-mgmt-1.0.0/incident-dashboard.xml
index b03493f7c6..6efe574509 100644
--- a/datamodel/itop-incident-mgmt-1.0.0/incident-dashboard.xml
+++ b/datamodel/itop-incident-mgmt-1.0.0/incident-dashboard.xml
@@ -7,7 +7,7 @@
   <dashlet id="1" xsi:type="DashletGroupByBars">
    <title>UI-IncidentManagementOverview-IncidentByService</title>
    <query>SELECT Incident</query>
-   <group_by>service_name</group_by>
+   <group_by>service_id</group_by>
    <style>bars</style>
   </dashlet>
  </cell>
diff --git a/datamodel/itop-problem-mgmt-1.0.0/overview.xml b/datamodel/itop-problem-mgmt-1.0.0/overview.xml
index 6b1ab93e72..bfb64de0c9 100644
--- a/datamodel/itop-problem-mgmt-1.0.0/overview.xml
+++ b/datamodel/itop-problem-mgmt-1.0.0/overview.xml
@@ -7,12 +7,12 @@
       <dashlet id="1" xsi:type="DashletGroupByBars">
         <title>UI-ProblemManagementOverview-ProblemByService</title>
         <query>SELECT Problem</query>
-        <group_by>service_name</group_by>
+        <group_by>service_id</group_by>
         <style>bars</style>
       </dashlet>
     </cell>
     <cell>
-      <dashlet id="1" xsi:type="DashletGroupByPie">
+      <dashlet id="2" xsi:type="DashletGroupByPie">
         <title>UI-ProblemManagementOverview-ProblemByPriority</title>
         <query>SELECT Problem</query>
         <group_by>priority</group_by>
diff --git a/datamodel/itop-request-mgmt-1.0.0/request-dashboard.xml b/datamodel/itop-request-mgmt-1.0.0/request-dashboard.xml
index 2f3a2c9862..b61e43a259 100644
--- a/datamodel/itop-request-mgmt-1.0.0/request-dashboard.xml
+++ b/datamodel/itop-request-mgmt-1.0.0/request-dashboard.xml
@@ -7,7 +7,7 @@
   <dashlet id="1" xsi:type="DashletGroupByBars">
    <title>UI-RequestManagementOverview-RequestByService</title>
    <query>SELECT UserRequest</query>
-   <group_by>service_name</group_by>
+   <group_by>service_id</group_by>
    <style>bars</style>
   </dashlet>
  </cell>