diff --git a/apps/heatsuite/custom.html b/apps/heatsuite/custom.html
index d79b4df64..5017913de 100644
--- a/apps/heatsuite/custom.html
+++ b/apps/heatsuite/custom.html
@@ -311,8 +311,7 @@
           const checkboxes = form.querySelectorAll(`input[type="checkbox"][name="${name}"]`);
           const values = Array.from(checkboxes)
                               .filter(cb => cb.checked)
-                              .map(cb => cb.value);
-    
+                              .map(cb => cb.hasAttribute('value') ? cb.value : true);                
           data[name] = forceArrayFields.includes(name) ? values : (values.length ? values[0] : false);
         } else {
           if (data.hasOwnProperty(name)) {
diff --git a/apps/heatsuite/heatsuite.app.js b/apps/heatsuite/heatsuite.app.js
index 238358f88..9519d73b2 100644
--- a/apps/heatsuite/heatsuite.app.js
+++ b/apps/heatsuite/heatsuite.app.js
@@ -144,7 +144,7 @@ function draw() {
       if (settings["bt_" + task.id + "_id"] === undefined || !settings["bt_" + task.id + "_id"]) {
         //make it clickable so we can go to settings and pair something
         btn.btnFaceCol = "#FF0000";
-        btn.cb = l => eval(require("Storage").read("heatsuite.settings.js"))(()=>load());
+        btn.cb = l => eval(require("Storage").read("heatsuite.settings.js"))(()=>load("heatsuite.app.js"));
       }
     }
     if(task.btInfo !== undefined){
diff --git a/apps/heatsuite/heatsuite.boot.js b/apps/heatsuite/heatsuite.boot.js
deleted file mode 100644
index 566cab43d..000000000
--- a/apps/heatsuite/heatsuite.boot.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatsuite").enable();
\ No newline at end of file
diff --git a/apps/heatsuite/metadata.json b/apps/heatsuite/metadata.json
index 013a1377f..3e1346aa5 100644
--- a/apps/heatsuite/metadata.json
+++ b/apps/heatsuite/metadata.json
@@ -15,7 +15,6 @@
     {"name":"heatsuite.img","url":"app-icon.js","evaluate":true},
     {"name":"HSModule","url":"heatsuite.module.js"},
     {"name":"heatsuite.app.js","url":"heatsuite.app.js"},
-    {"name":"heatsuite.boot.js","url":"heatsuite.boot.js"},
     {"name":"heatsuite.settings.js","url":"heatsuite.settings.js"},
     {"name":"heatsuite.wid.js","url":"heatsuite.wid.js"},
     {"name":"heatsuite.survey.js","url":"heatsuite.survey.js"},