diff --git a/templates/group_created.json.j2 b/templates/group_created.json.j2
index 5d9f19d..bcf4f1b 100644
--- a/templates/group_created.json.j2
+++ b/templates/group_created.json.j2
@@ -12,11 +12,11 @@
 		  "taskReferenceName": "init",
 		  "type": "LAMBDA",
 		  "inputParameters": {
-			  "root_vo": "{{ encodeURI(root_vo) }}",
+			  "root_vo": "{{ root_vo }}",
 			  "keycloak": "{{ keycloak }}/{{ keycloak_realm }}",
 			  "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}",
 			  "clientId" : "${workflow.input.group}",
-			  "scriptExpression": "var tree = $.clientId.split('%2F'); return { 'tree' : tree, 'child': tree[tree.length-1], 'append' : tree.slice(0,-1).join('/'), 'name' : tree.join('/')}"
+			  "scriptExpression": "var tree = $.clientId.split('%2F'); return { 'tree' : tree, 'child': tree[tree.length-1], 'append' : tree.slice(0,-1).join('/'), 'name' : tree.join('/'), encoded_root_vo : encodeURI($.root_vo)}"
 		  }
 		},
 		{
@@ -158,7 +158,7 @@
               "taskReferenceName" : "get_rootvo",
               "type" : "SIMPLE",
               "inputParameters" : {
-                  "url" : "${init.input.keycloak_admin}/clients?clientId=${init.input.root_vo}",
+                  "url" : "${init.input.keycloak_admin}/clients?clientId=${init.output.encoded_root_vo}",
                   "method" : "GET",
                   "headers" : {
                       "Authorization" : "Bearer ${authorize.output.body.access_token}",
diff --git a/templates/role_created.json.j2 b/templates/role_created.json.j2
index 54fbc42..add79a3 100644
--- a/templates/role_created.json.j2
+++ b/templates/role_created.json.j2
@@ -12,7 +12,6 @@
 		  "taskReferenceName": "init",
 		  "type": "LAMBDA",
 		  "inputParameters": {
-			  "root_vo": "{{ encodeURI(root_vo) }}",
 			  "keycloak": "{{ keycloak }}/{{ keycloak_realm }}",
 			  "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}",
 			  "scriptExpression": "1 == 1"