diff --git a/BaaSClient.html b/BaaSClient.html
index 804799e..084ec5b 100644
--- a/BaaSClient.html
+++ b/BaaSClient.html
@@ -160,6 +160,7 @@
 		</div>
 	</div>
 	<script>
+		const isBaaS = true
 		var h = document.body.clientHeight
 				- $("header").css("height").replace("px", "")
 
diff --git a/js/bdwareclient.js b/js/bdwareclient.js
index d2370b9..6a3a896 100644
--- a/js/bdwareclient.js
+++ b/js/bdwareclient.js
@@ -774,7 +774,7 @@ function connectNode() {
 }
 
 function getRequestParameters() {
-    if (location.href.indexOf("BaaSClient") !== -1) {
+    if (isBaaS) {
         let params = location.href.replace(/[^#]*(#(\/)?|\?)/, '')
         let url = location.href.replace(params, '')
         while (!params) {
diff --git a/js/commonutil.js b/js/commonutil.js
index 816bb57..dc12c64 100644
--- a/js/commonutil.js
+++ b/js/commonutil.js
@@ -189,8 +189,7 @@ function initGlobal(urlParams) {
         window.global = {};
     }
     global.result = "";
-    if (location.href.indexOf("BaaSClient") !== -1) {
-        global.isBaaS = true
+    if (isBaaS) {
         primaryColor = '#08263a'
     }
     if (urlParams) {