diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index 1247970e..b457a5cf 100644
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -1442,12 +1442,13 @@ class AppBase:
                         failed = False
                         break
 
-                    elif ret.status_code == 500 or ret.status_code == 400:
+                    #elif ret.status_code == 500 or ret.status_code == 400:
+                    elif ret.status_code >= 400:
                         self.logger.info("[ERROR] (fails: %d) Error in app with status code %d for results (1). RETRYING because results can't be handled" % (i+1, ret.status_code))
                     
                         rettext = ret.text
                         failed = True 
-                        time.sleep(10)
+                        time.sleep(8)
                         continue
 
                     else:
diff --git a/backend/go-app/main.go b/backend/go-app/main.go
index 4c9b21b5..49c7b90b 100644
--- a/backend/go-app/main.go
+++ b/backend/go-app/main.go
@@ -88,7 +88,7 @@ var runningEnvironment = "onprem"
 
 var syncUrl = "https://shuffler.io"
 
-//var syncUrl = "http://localhost:5002"
+// var syncUrl = "http://localhost:5002"
 var syncSubUrl = "https://shuffler.io"
 
 //var syncUrl = "http://localhost:5002"
@@ -1052,6 +1052,7 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
 		chatDisabled = true
 	}
 
+	userOrgs = shuffle.SortOrgList(userOrgs)
 	orgPriorities := org.Priorities
 	if len(org.Priorities) < 5 {
 		log.Printf("[WARNING] Should find and add priorities as length is less than 5 for org %s", userInfo.ActiveOrg.Id)
@@ -3916,7 +3917,7 @@ func runInitCloudSetup() {
 }
 
 func runInitEs(ctx context.Context) {
-	log.Printf("[DEBUG] Starting INIT setup (ES)")
+	log.Printf("[DEBUG] Starting INIT setup for Elasticsearch/Opensearch")
 
 	httpProxy := os.Getenv("HTTP_PROXY")
 	if len(httpProxy) > 0 {
@@ -3933,7 +3934,7 @@ func runInitEs(ctx context.Context) {
 		log.Printf("[DEBUG] Setting default environment for org to %s", defaultEnv)
 	}
 
-	log.Printf("[DEBUG] Getting organizations")
+	log.Printf("[DEBUG] Getting organizations for Elasticsearch/Opensearch")
 	activeOrgs, err := shuffle.GetAllOrgs(ctx)
 
 	setUsers := false
@@ -4388,7 +4389,7 @@ func runInit(ctx context.Context) {
 	//}
 	//log.Printf("[DEBUG] Finalized init statistics update")
 
-	log.Printf("[DEBUG] Starting INIT setup")
+	log.Printf("[DEBUG] Starting INIT setup (NOT Opensearch/Elasticsearch!)")
 	httpProxy := os.Getenv("HTTP_PROXY")
 	if len(httpProxy) > 0 {
 		log.Printf("Running with HTTP proxy %s (env: HTTP_PROXY)", httpProxy)
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index e1a40f7b..3c71db51 100644
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -446,6 +446,11 @@ func deployServiceWorkers(image string) {
 			serviceSpec.TaskTemplate.ContainerSpec.Env = append(serviceSpec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("SHUFFLE_WORKER_SERVER_URL=%s", os.Getenv("SHUFFLE_WORKER_SERVER_URL")))
 		}
 
+		// Handles backend
+		if len(os.Getenv("BASE_URL")) > 0 {
+			serviceSpec.TaskTemplate.ContainerSpec.Env = append(serviceSpec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("BASE_URL=%s", os.Getenv("BASE_URL")))
+		}
+
 		if len(os.Getenv("DOCKER_HOST")) > 0 {
 			serviceSpec.TaskTemplate.ContainerSpec.Env = append(serviceSpec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("DOCKER_HOST=%s", os.Getenv("DOCKER_HOST")))
 		} else {