diff --git a/src/main/java/com/baloise/azure/FunctionalOrgEndpoint.java b/src/main/java/com/baloise/azure/FunctionalOrgEndpoint.java
index bbbd3be..badfce5 100644
--- a/src/main/java/com/baloise/azure/FunctionalOrgEndpoint.java
+++ b/src/main/java/com/baloise/azure/FunctionalOrgEndpoint.java
@@ -87,6 +87,7 @@ public HttpResponseMessage v1(
 				return createAvatarResponse(request, path.get(1));
 			}
 			
+			if(request.getQueryParameters().containsKey("clear")) graph().clear();
 			final StringTree child = graph().getOrg().getChild(path.toArray(new String[0]));
 			
 			return child.isLeaf() ?  createTeamResponse(request, context, child) : createOrganisationResponse(request, context, child);
@@ -137,7 +138,7 @@ private HttpResponseMessage createTeamResponse(HttpRequestMessage<Optional<Strin
 
 	String[] getRoles(HttpRequestMessage<Optional<String>> request) {
 		String roles = request.getQueryParameters().get("roles");
-		return (roles == null) ? new String[0] : roles.split("\\s+,\\s+");
+		return (roles == null) ? new String[0] : roles.trim().split("\\s*,\\s*");
 	}
 	
 	private HttpResponseMessage createOrganisationResponse(HttpRequestMessage<Optional<String>> request, ExecutionContext context, StringTree tree)