diff --git a/kamailio/presence_query-role.cfg b/kamailio/presence_query-role.cfg
index 325de55..47962ed 100644
--- a/kamailio/presence_query-role.cfg
+++ b/kamailio/presence_query-role.cfg
@@ -23,7 +23,7 @@ route[PRESENCE_SEARCH_SUMMARY]
     if($var(Username) != "") {
        $var(Query) = $var(Query) + $_s( and watcher_username = "$var(Username)");
     }
-    $var(Query) = $var(Query) + " order by to_user, event, watcher_username, callid";
+    $var(Query) = $var(Query) + " order by presentity_uri, event, watcher_username, callid";
     xlog("L_DEBUG", "$ci| QUERY $var(Query)\n");
 
     if (sql_xquery("cb", "$var(Query)", "ra") == 1)
@@ -31,16 +31,16 @@ route[PRESENCE_SEARCH_SUMMARY]
         $var(Subs) = "";
         $var(Sep1) = "";
         while($xavp(ra) != $null) {
-           $var(Username) = $xavp(ra=>to_user);
+           $var(Username) = $(xavp(ra=>presentity_uri){s.tolower});
            $var(Sep2)="";
            $var(Evt)="";
-           while($xavp(ra) != $null && $var(Username) == $xavp(ra=>to_user))
+           while($xavp(ra) != $null && $var(Username) == $(xavp(ra=>presentity_uri){s.tolower}) )
            {
               $var(Event) = $xavp(ra=>event);
               $var(Sep3)="";
               $var(Sub)="";
               $var(Count) = 0;
-              while($xavp(ra) != $null && $var(Username) == $xavp(ra=>to_user) && $var(Event) == $xavp(ra=>event))
+              while($xavp(ra) != $null && $var(Username) == $(xavp(ra=>presentity_uri){s.tolower}) && $var(Event) == $xavp(ra=>event))
               {
                   $var(Count) = $var(Count) + 1;
                   pv_unset("$xavp(ra)");
@@ -48,7 +48,7 @@ route[PRESENCE_SEARCH_SUMMARY]
               $var(Evt) = $var(Evt) + $var(Sep2) + $_s("$var(Event)" : $var(Count));
               $var(Sep2)=", ";
            }
-          $var(Subs) = $var(Subs) + $var(Sep1) + $_s("$var(Username)") + " : { " + $var(Evt) + " }";
+          $var(Subs) = $var(Subs) + $var(Sep1) + $_s("$(var(Username){uri.user})") + " : { " + $var(Evt) + " }";
           $var(Sep1)=", ";
         }
     }