diff --git a/src/WebAppDIRAC/WebApp/handler/ComponentHistoryHandler.py b/src/WebAppDIRAC/WebApp/handler/ComponentHistoryHandler.py
index 3c0754b9b..e7230e39a 100644
--- a/src/WebAppDIRAC/WebApp/handler/ComponentHistoryHandler.py
+++ b/src/WebAppDIRAC/WebApp/handler/ComponentHistoryHandler.py
@@ -85,7 +85,7 @@ def web_getSelectionData(self):
       for field in fields:
         data[field] = list(data[field])
         data[field].sort()
-        data[field] = map(lambda x: [x], data[field])
+        data[field] = [[x] for x in data[field]]
     else:
       raise WErr.fromSERROR(result)
 
diff --git a/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py b/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py
index 2b4d71507..1a5c545e2 100644
--- a/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py
+++ b/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py
@@ -40,8 +40,8 @@ def web_getSelectionData(self):
     groups = uniqueElements(groups)
     users.sort()
     groups.sort()
-    users = map(lambda x: [x], users)
-    groups = map(lambda x: [x], groups)
+    users = [[x] for x in users]
+    groups = [[x] for x in groups]
 
     callback["username"] = users
     callback["usergroup"] = groups
diff --git a/src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py b/src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py
index d95d21efa..51594f1ba 100644
--- a/src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py
+++ b/src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py
@@ -346,7 +346,7 @@ def web_getUsersGroups(self):
       return
     result = result["Value"]
 
-    users = map(lambda x: [x], result)
+    users = [[x] for x in result]
 
     result = gConfig.getSections("/Registry/Groups")
     if not result["OK"]:
@@ -354,7 +354,7 @@ def web_getUsersGroups(self):
       return
     result = result["Value"]
 
-    groups = map(lambda x: [x], result)
+    groups = [[x] for x in result]
 
     self.finish({"success": "true", "users": users, "groups": groups, "email": self.getUserEmail()})