diff --git a/adm/templates/adm/adm_import_flow.html b/adm/templates/adm/adm_import_flow.html
index 3133978..1b75cc5 100644
--- a/adm/templates/adm/adm_import_flow.html
+++ b/adm/templates/adm/adm_import_flow.html
@@ -28,9 +28,10 @@
         
         $(document).ready(function(){
             // FIRST CALL GROUPS, When Groups finished User will call by Groups
-            //createAgencyGroups(groupids[0]);
+            createAgencyGroups(groupids[0]);
+            
             //DEV
-            rebuildingStandards(standards[0]);
+            //rebuildingStandards(standards[0]);
             //addGroupFolder();
             //addDirs(dirids[0]);
         })
diff --git a/api/views.py b/api/views.py
index 13c985a..4e610d7 100644
--- a/api/views.py
+++ b/api/views.py
@@ -444,13 +444,7 @@ def NCSwitchStandardFiles(request):
 		response_status = "OK"
 		for f in standard.addedfiles.all():
 
-			
-			#filesearchdata = '<?xml version="1.0" encoding="UTF-8"?><d:searchrequest xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns"><d:basicsearch><d:select><d:prop><oc:fileid/><d:displayname/></d:prop></d:select><d:from><d:scope><d:href>/files/' + settings.NEXTCLOUD_USER_API + '/Agenturdaten_' + str(standard.agency.pk) + '</d:href><d:depth>infinity</d:depth></d:scope></d:from><d:where><d:like><d:prop><d:displayname/></d:prop><d:literal>' + file_name_normal_utf8  + '</d:literal></d:like></d:where></d:basicsearch></d:searchrequest>'
-
-			filesearchdata = '<?xml version="1.0" encoding="UTF-8"?><d:searchrequest xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns"><d:basicsearch><d:select><d:prop><oc:fileid/><d:displayname/></d:prop></d:select><d:from><d:scope><d:href>/files/' + settings.NEXTCLOUD_USER_API + '/Agenturdaten</d:href><d:depth>infinity</d:depth></d:scope></d:from><d:where><d:like><d:prop><d:displayname/></d:prop><d:literal>' + f.name  + '</d:literal></d:like></d:where></d:basicsearch></d:searchrequest>'
-
-			filesearchdata_temp = filesearchdata.encode('UTF-8')
-			filesearchdata = filesearchdata_temp.decode('UTF-8')
+			filesearchdata = '<?xml version="1.0" encoding="UTF-8"?><d:searchrequest xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns"><d:basicsearch><d:select><d:prop><oc:fileid/><d:displayname/></d:prop></d:select><d:from><d:scope><d:href>/files/' + settings.NEXTCLOUD_USER_API + '/Agenturdaten_' + str(standard.agency.pk) + '</d:href><d:depth>infinity</d:depth></d:scope></d:from><d:where><d:like><d:prop><d:displayname/></d:prop><d:literal>' + f.name  + '</d:literal></d:like></d:where></d:basicsearch></d:searchrequest>'
 
 			r = requests.request("SEARCH", settings.NEXTCLOUD_URL +  "remote.php/dav", data=filesearchdata, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), headers={'Content-Type' : 'text/xml'})
 			fileid = getFileIdFromXML(r.text)