diff --git a/core/src/core/classes/class.AuthService.php b/core/src/core/classes/class.AuthService.php
index 4108639863..27403ed65e 100644
--- a/core/src/core/classes/class.AuthService.php
+++ b/core/src/core/classes/class.AuthService.php
@@ -960,12 +960,12 @@ public static function getUsersForRepository($repositoryId)
      * Retrieve the current users who have either read or write access to a repository
      * @param $repositoryId
      * @param string $rolePrefix
-     * @param bool $countOnly
+     * @param bool $splitByType
      * @return array
      */
-    public static function getRolesForRepository($repositoryId, $rolePrefix = '', $countOnly = false)
+    public static function getRolesForRepository($repositoryId, $rolePrefix = '', $splitByType = false)
     {
-        return ConfService::getConfStorageImpl()->getRolesForRepository($repositoryId, $rolePrefix, $countOnly);
+        return ConfService::getConfStorageImpl()->getRolesForRepository($repositoryId, $rolePrefix, $splitByType);
     }
 
     /**
diff --git a/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js b/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js
index 96b0e597b4..de314097d2 100644
--- a/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js
+++ b/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js
@@ -374,11 +374,11 @@
             }
             var blocks = [];
             var data = this.state.data;
-            if(data['core.users'] && data['core.users']['internal'] != undefined && data['core.users']['external'] != undefined){
+            if(data['core.users'] && data['core.users']['users'] != undefined && data['core.users']['groups'] != undefined){
                 blocks.push(
                     <HomeWorkspaceLegendInfoBlock key="core.users" badgeTitle={MessageHash[527]} iconClass="icon-group">
-                    {MessageHash[531]} {data['core.users']['internal']}
-                    <br/>{MessageHash[532]} {data['core.users']['external']}
+                    {data['core.users']['users'] ? (MessageHash[531] + ' ' + data['core.users']['users']) : ''}
+                    {data['core.users']['groups'] ? (MessageHash[532] + ' ' + data['core.users']['groups']) : ''}
                     </HomeWorkspaceLegendInfoBlock>
                 );
             }
@@ -524,4 +524,4 @@
     WelcomeComponents.TutorialPane = TutorialPane;
     global.WelcomeComponents = WelcomeComponents;
 
-})(window);
\ No newline at end of file
+})(window);
diff --git a/core/src/plugins/conf.sql/class.sqlConfDriver.php b/core/src/plugins/conf.sql/class.sqlConfDriver.php
index ccb240eca1..cb057cf6f1 100644
--- a/core/src/plugins/conf.sql/class.sqlConfDriver.php
+++ b/core/src/plugins/conf.sql/class.sqlConfDriver.php
@@ -537,43 +537,100 @@ public function getUsersForRepository($repositoryId)
      * @abstract
      * @param string $repositoryId
      * @param string $rolePrefix
-     * @param bool $countOnly
+     * @param bool $splitByType
      * @return array()
      */
-    public function getRolesForRepository($repositoryId, $rolePrefix = '', $countOnly = false){
+    public function getRolesForRepository($repositoryId, $rolePrefix = '', $splitByType = false){
         $allRoles = array();
 
+        // Initing select
+        $q['select']['role_id'] = '[role_id]';
+
+        if ($splitByType) {
+            $q['select']['type'] = 'case when [role_id] LIKE \'AJXP_USR%\' then \'role_user\' when [role_id] LIKE \'AJXP_GRP%\' then \'role_grp\' else \'role_role\' end';
+        }
+
+        // Initing from
+        $q['from']['a'] = '[ajxp_roles]';
+
+        // Initing where and args
+        if(is_numeric($repositoryId)){
+            $likeRepositoryId = "i:$repositoryId;s:";
+        }else{
+            $likeRepositoryId = '"'.$repositoryId.'";s:';
+        }
         switch ($this->sqlDriver["driver"]) {
             case "sqlite":
             case "sqlite3":
             case "postgre":
-                if(!empty($rolePrefix)){
-                    $children_results = dibi::query('SELECT [role_id] FROM [ajxp_roles] WHERE [searchable_repositories] LIKE %~like~ AND [role_id] LIKE %like~ GROUP BY [role_id]', '"'.$repositoryId.'";s:', $rolePrefix);
-                }else{
-                    $children_results = dibi::query('SELECT [role_id] FROM [ajxp_roles] WHERE [searchable_repositories] LIKE %~like~ GROUP BY [role_id]', '"'.$repositoryId.'";s:');
-                }
+                $q['where'][] = ['[searchable_repositories] LIKE %~like~', $likeRepositoryId];
                 break;
             case "mysql":
-                if(!empty($rolePrefix)){
-                    $children_results = dibi::query('SELECT [role_id] FROM [ajxp_roles] WHERE [serial_role] LIKE %~like~ AND [role_id] LIKE %like~ GROUP BY [role_id]', '"'.$repositoryId.'";s:', $rolePrefix);
-                }else{
-                    $children_results = dibi::query('SELECT [role_id] FROM [ajxp_roles] WHERE [serial_role] LIKE %~like~ GROUP BY [role_id]', '"'.$repositoryId.'";s:');
-                }
+                $q['where'][] = ['[serial_role] LIKE %~like~', $likeRepositoryId];
                 break;
             default:
                 return "ERROR!, DB driver ". $this->sqlDriver["driver"] ." not supported yet in __FUNCTION__";
         }
-        $all = $children_results->fetchAll();
+
+        if(!empty($rolePrefix)){
+            $q['where'][] = ['[role_id] LIKE %like~', $rolePrefix];
+        }
+
+        // Initing group by
+        $q['groupBy'][] = '[role_id]';
+
+        // Building the request from $q
+
+        // Building select
+        $reqStr = 'SELECT';
+        foreach ($q['select'] as $k => $v) {
+            $selectStr[] = $v.' as '.$k;
+        }
+        $reqStr .= ' ';
+        $reqStr .= join(', ', $selectStr);
+        $reqStr .= ' ';
+
+        // Building from
+        $reqStr .= 'FROM';
+        foreach ($q['from'] as $k => $v) {
+            $from[] = $v.' '.$k;
+        }
+        $reqStr .= ' ';
+        $reqStr .= join(', ', $from);
+        $reqStr .= ' ';
+
+        // Building where
+        if (!empty($q['where'])) {
+            $reqStr .= 'WHERE %and';
+            $reqStr .= ' ';
+        }
+
+        // Building group by
+        if (!empty($q['where'])) {
+            $reqStr .= 'GROUP BY';
+            $reqStr .= ' ';
+            $reqStr .= join(', ', $q['groupBy']);
+            $reqStr .= ' ';
+        }
+
+        $res =  dibi::query($reqStr, $q['where']);
+        $all = $res->fetchAll();
         foreach ($all as $item) {
-            $rId = $item["role_id"];
-            $allRoles[] = $rId;
+            $rId = $item['role_id'];
+
+            if ($splitByType) {
+                $type = $item['type'];
+                $allRoles[$type][] = $rId;
+            } else {
+                $allRoles[] = $rId;
+            }
         }
 
         return $allRoles;
     }
 
 
-    public function getUsersForRole($roleId, $countOnly = false){
+    public function getUsersForRole($roleId, $countOnly = false) {
         if($countOnly){
             $res =  dibi::query("SELECT count([login]) FROM [ajxp_user_rights] WHERE [repo_uuid] = %s AND [rights] LIKE %~like~", "ajxp.roles", '"'.$roleId.'";b:1');
             return $res->fetchSingle();
@@ -602,52 +659,19 @@ public function countUsersForRepository($repositoryId, $details = false, $admin=
                 else return $groupUsers;
             }
         }
+
         // Users from roles
         $internal = 0;
-        $roles = $this->getRolesForRepository($repositoryId);
-        foreach($roles as $rId){
-            if(strpos($rId, "AJXP_USR_/") === 0) continue;
-            $internal += $this->getUsersForRole($rId, true);
-        }
+        $roles = $this->getRolesForRepository($repositoryId, '', $details);
 
-        // NEW METHOD : SEARCH PERSONAL ROLE
-        if(is_numeric($repositoryId)){
-            $likeValue = "i:$repositoryId;s:";
-        }else{
-            $likeValue = '"'.$repositoryId.'";s:';
-        }
-        switch ($this->sqlDriver["driver"]) {
-            case "sqlite":
-            case "sqlite3":
-            case "postgre":
-                $q = 'SELECT count([role_id]) FROM [ajxp_roles] WHERE [role_id] LIKE \'AJXP_USR_/%\' AND [searchable_repositories] LIKE %~like~';
-                break;
-            case "mysql":
-                $q = 'SELECT count([role_id]) as c FROM [ajxp_roles] WHERE [role_id] LIKE \'AJXP_USR_/%\' AND [serial_role] LIKE %~like~';
-                break;
-            default:
-                return "ERROR!, DB driver ". $this->sqlDriver["driver"] ." not supported yet in __FUNCTION__";
-        }
         if($details){
-            if($this->sqlDriver["driver"] == "sqlite" || $this->sqlDriver["driver"] == "sqlite3"){
-                $internalClause = " AND NOT EXISTS (SELECT * FROM [ajxp_user_rights] WHERE [ajxp_roles].[role_id]='AJXP_USR_/'||[ajxp_user_rights].[login] AND [ajxp_user_rights].[repo_uuid] = 'ajxp.parent_user')";
-                $externalClause = " AND EXISTS (SELECT * FROM [ajxp_user_rights] WHERE [ajxp_roles].[role_id]='AJXP_USR_/'||[ajxp_user_rights].[login] AND [ajxp_user_rights].[repo_uuid] = 'ajxp.parent_user')";
-            }else{
-                $internalClause = " AND NOT EXISTS (SELECT * FROM [ajxp_user_rights] WHERE [ajxp_roles].[role_id]=CONCAT('AJXP_USR_/',[ajxp_user_rights].[login]) AND [ajxp_user_rights].[repo_uuid] = 'ajxp.parent_user')";
-                $externalClause = " AND EXISTS (SELECT * FROM [ajxp_user_rights] WHERE [ajxp_roles].[role_id]=CONCAT('AJXP_USR_/',[ajxp_user_rights].[login]) AND [ajxp_user_rights].[repo_uuid] = 'ajxp.parent_user')";
-            }
-            $intRes = dibi::query($q.$internalClause, $likeValue);
-            $extRes = dibi::query($q.$externalClause, $likeValue);
             return array(
-                'internal' => $internal + $intRes->fetchSingle(),
-                'external' => $extRes->fetchSingle()
+                'users' => count($roles['role_user']),
+                'groups' => count($roles['role_group']) + count($roles['role_role'])
             );
         }else{
-            $res = dibi::query($q, $likeValue);
-            return $internal + $res->fetchSingle();
-
+            return count($roles);
         }
-        //$all = $res->fetchAll();
     }
 
 
diff --git a/core/src/plugins/core.ajaxplorer/i18n/ca.php b/core/src/plugins/core.ajaxplorer/i18n/ca.php
index 7eb60a25e1..772f6e68e2 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/ca.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/ca.php
@@ -587,8 +587,8 @@
 "527"=> "Compartit amb",
 "528"=> "Usuaris interns",
 "530"=> "Usuaris externs",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identificador emprat per accedir, per favor empri caràcters alfanumèrics en minúscules o correu electrònic.",
 "534" => "Contrasenya emprada per acceder",
 "535" => "Enviar contrasenya per correu electrònic",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/cs.php b/core/src/plugins/core.ajaxplorer/i18n/cs.php
index 78090edf6c..f45d7deb1e 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/cs.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/cs.php
@@ -586,8 +586,8 @@
 "527"=> "Sdíleno s",
 "528"=> "Interními uživateli",
 "530"=> "Externími uživateli",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifikátor použitý pro přihlášení, použijte prosím pouze písmena a čísla nebo znaky emailu malými písmeny.",
 "534" => "Heslo pro přihlášení",
 "535" => "Poslat heslo e-mailem",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/da.php b/core/src/plugins/core.ajaxplorer/i18n/da.php
index 54aec3881c..c7b1c3c5c4 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/da.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/da.php
@@ -589,8 +589,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/de.php b/core/src/plugins/core.ajaxplorer/i18n/de.php
index 5a641a9d92..bdad680321 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/de.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/de.php
@@ -593,8 +593,8 @@
 "527"=> "Geteilt mit",
 "528"=> "Interne Benutzer",
 "530"=> "Externe Benutzer",
-"531"=> "Intern",
-"532"=> "Extern",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Sende Passwort via E-Mail",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/en.php b/core/src/plugins/core.ajaxplorer/i18n/en.php
index 910476f7b5..9f0e4f4e0c 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/en.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/en.php
@@ -586,8 +586,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/es.php b/core/src/plugins/core.ajaxplorer/i18n/es.php
index 97c7b8ae17..1a4de49ee2 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/es.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/es.php
@@ -591,8 +591,8 @@
 "527"=> "Compartido con",
 "528"=> "Usuarios internos",
 "530"=> "Usuarios externos",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identificador usado para acceder, por favor utilice caracteres alfanuméricos en minúsculas o correo electrónico.",
 "534" => "Contraseña usada para acceder",
 "535" => "Enviar contraseña por correo electrónico",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/et.php b/core/src/plugins/core.ajaxplorer/i18n/et.php
index 303cb03fa6..9487dc811f 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/et.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/et.php
@@ -587,8 +587,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/eus.php b/core/src/plugins/core.ajaxplorer/i18n/eus.php
index edc3fca4ae..f62e175e3a 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/eus.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/eus.php
@@ -585,8 +585,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/fi.php b/core/src/plugins/core.ajaxplorer/i18n/fi.php
index d7bbfa1a8b..7457460c9c 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/fi.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/fi.php
@@ -587,8 +587,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/fr.php b/core/src/plugins/core.ajaxplorer/i18n/fr.php
index 5274903b92..ae5e7c32c1 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/fr.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/fr.php
@@ -586,8 +586,8 @@
 "527"=> "Partagé",
 "528"=> "Utilisateurs internes",
 "530"=> "Utilisateurs externes",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifiant utilisé pour se logger, veuillez utiliser des caractères alphanumériques ou d'email, en minuscule.",
 "534" => "Mot de passe utilisé pour se logger",
 "535" => "Envoyer le mot de passe par email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/gr.php b/core/src/plugins/core.ajaxplorer/i18n/gr.php
index 66c2d32db0..715ded4ace 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/gr.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/gr.php
@@ -584,8 +584,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/he.php b/core/src/plugins/core.ajaxplorer/i18n/he.php
index 44d9ffe46b..e0c78aa4ff 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/he.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/he.php
@@ -584,8 +584,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/hu.php b/core/src/plugins/core.ajaxplorer/i18n/hu.php
index fca0bf20b0..9ae3e6295d 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/hu.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/hu.php
@@ -589,8 +589,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/it.php b/core/src/plugins/core.ajaxplorer/i18n/it.php
index c613658c36..876176875d 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/it.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/it.php
@@ -604,8 +604,8 @@
 "527"=> "Condiviso con",
 "528"=> "Utenti Interni",
 "530"=> "Utenti Esterni",
-"531"=> "Int.",
-"532"=> "Est.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/ja.php b/core/src/plugins/core.ajaxplorer/i18n/ja.php
index 47c6d01891..4166850c76 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/ja.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/ja.php
@@ -589,8 +589,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/kr.php b/core/src/plugins/core.ajaxplorer/i18n/kr.php
index 849d09c2df..9ed9e0da67 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/kr.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/kr.php
@@ -593,8 +593,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/nl.php b/core/src/plugins/core.ajaxplorer/i18n/nl.php
index fc37026833..2ea5ac3acb 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/nl.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/nl.php
@@ -590,8 +590,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/no.php b/core/src/plugins/core.ajaxplorer/i18n/no.php
index 1a5b302efc..1f66687cf2 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/no.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/no.php
@@ -588,8 +588,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/pl.php b/core/src/plugins/core.ajaxplorer/i18n/pl.php
index 786447eb6a..66bec0c9ed 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/pl.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/pl.php
@@ -584,8 +584,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/pt-br.php b/core/src/plugins/core.ajaxplorer/i18n/pt-br.php
index e178387776..1a236f96cd 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/pt-br.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/pt-br.php
@@ -588,8 +588,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/pt.php b/core/src/plugins/core.ajaxplorer/i18n/pt.php
index 8094e1476a..0b32cae68b 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/pt.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/pt.php
@@ -584,8 +584,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/ru.php b/core/src/plugins/core.ajaxplorer/i18n/ru.php
index 30734804fa..72d9daba61 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/ru.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/ru.php
@@ -586,8 +586,8 @@
 "527"=> "Общее с",
 "528"=> "Внутренних",
 "530"=> "Внешних",
-"531"=> "Внутр.",
-"532"=> "Внеш.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Идентификатор для входа, латинские буквы и цифры или email в нижнем регистре.",
 "534" => "Пароль для входа",
 "535" => "Послать пароль по e-mail",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/si.php b/core/src/plugins/core.ajaxplorer/i18n/si.php
index 08361820ce..c14ac1bc7f 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/si.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/si.php
@@ -585,8 +585,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/sv.php b/core/src/plugins/core.ajaxplorer/i18n/sv.php
index 0b431846c2..4aee927c77 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/sv.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/sv.php
@@ -584,8 +584,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/tr.php b/core/src/plugins/core.ajaxplorer/i18n/tr.php
index cec287f077..092669913c 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/tr.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/tr.php
@@ -587,8 +587,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/zh-tw.php b/core/src/plugins/core.ajaxplorer/i18n/zh-tw.php
index 48df2813c0..e7c50704b0 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/zh-tw.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/zh-tw.php
@@ -587,8 +587,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/zh.php b/core/src/plugins/core.ajaxplorer/i18n/zh.php
index d77aeca934..e276cb8525 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/zh.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/zh.php
@@ -596,8 +596,8 @@
 "527"=> "Shared with",
 "528"=> "Internal users",
 "530"=> "External users",
-"531"=> "Int.",
-"532"=> "Ext.",
+"531"=> "Users",
+"531"=> "Groups",
 "533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
 "534" => "Password used to login",
 "535" => "Send password by email",
diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php
index cd98338fe6..9fa6931b6c 100644
--- a/core/src/plugins/core.conf/class.AbstractConfDriver.php
+++ b/core/src/plugins/core.conf/class.AbstractConfDriver.php
@@ -444,10 +444,10 @@ abstract public function getUsersForRepository($repositoryId);
      * @abstract
      * @param string $repositoryId
      * @param string $rolePrefix
-     * @param bool $countOnly
+     * @param bool $splitByType
      * @return array An array of role ids
      */
-    abstract public function getRolesForRepository($repositoryId, $rolePrefix = '', $countOnly = false);
+    abstract public function getRolesForRepository($repositoryId, $rolePrefix = '', $splitByType = false);
     /**
      * @abstract
      * @param string $repositoryId