diff --git a/image_filter_messaging.py b/image_filter_messaging.py
index 30ed1fb..65ecbc0 100644
--- a/image_filter_messaging.py
+++ b/image_filter_messaging.py
@@ -85,9 +85,9 @@ def wait_for_response(secs, uid, unique) -> Response:
             time.sleep(0.2)
         if MessageState.waiting():
             PromptServer.instance.send_sync("cg-image-filter-images", {"timeout": True, "uid": uid, "unique":unique})
-        if MessageState.cancelled():
+        elif MessageState.cancelled():
             raise InterruptProcessingException()
-        if str(MessageState.latest.unique)!=str(unique):
+        elif str(MessageState.latest.unique)!=str(unique):
             print("Mismatched uniques...")
         return MessageState.get_response()
     finally: MessageState.stop_waiting()
diff --git a/js/log.js b/js/log.js
index ea41b66..1f6a3b1 100644
--- a/js/log.js
+++ b/js/log.js
@@ -4,15 +4,15 @@ export class Log {
     static log(s) { if (s) console.log(s) }
     static error(e) { console.error(e) }
     static detail(s) {
-        if (app.ui.settings.getSettingValue("ImageFilter.Z.DetailedLogging")) Log.log(s)
+        if (app.ui.settings.getSettingValue("Image Filter.Z.Detailed Logging")) Log.log(s)
     }
     static message_in(message, extra) {
-        if (!app.ui.settings.getSettingValue("ImageFilter.Z.DetailedLogging")) return
+        if (!app.ui.settings.getSettingValue("Image Filter.Z.Detailed Logging")) return
         if (message.detail && !message.detail.tick) Log.log(`--> ${JSON.stringify(message.detail)}` + (extra ? ` ${extra}` : ""))
         if (message.detail && message.detail.tick) Log.log(`--> tick`)
     }
     static message_out(response, extra) {
-        if (!app.ui.settings.getSettingValue("ImageFilter.Z.DetailedLogging")) return
+        if (!app.ui.settings.getSettingValue("Image Filter.Z.Detailed Logging")) return
         Log.log(`"<-- ${JSON.stringify(response)}` + (extra ? ` ${extra}` : ""))
     }
 }
\ No newline at end of file
diff --git a/js/popup.js b/js/popup.js
index b704fd0..615a41b 100644
--- a/js/popup.js
+++ b/js/popup.js
@@ -184,7 +184,7 @@ class Popup extends HTMLSpanElement {
         State.render(this)
     }
 
-    maybe_play_sound() { if (app.ui.settings.getSettingValue("ImageFilter.UI.PlaySound")) this.audio.play(); }
+    maybe_play_sound() { if (app.ui.settings.getSettingValue("Image Filter.UI.Play Sound")) this.audio.play(); }
 
     handle_message(message) { 
         Log.message_in(message)
@@ -219,7 +219,7 @@ class Popup extends HTMLSpanElement {
 
         this.node = node
 
-        if (this.state==State.INACTIVE && message.detail.urls && app.ui.settings.getSettingValue("ImageFilter.UI.SmallWindow") && !use_saved && !this.autosend()) {
+        if (this.state==State.INACTIVE && message.detail.urls && app.ui.settings.getSettingValue("Image Filter.UI.Small Window") && !use_saved && !this.autosend()) {
             this.state = State.TINY
             this.saved_message = message
             this.tiny_image.src = get_full_url(message.detail.urls[message.detail.urls.length-1])
@@ -379,7 +379,7 @@ class Popup extends HTMLSpanElement {
         this.frame = (this.frame+1)%this.video_frames
         Array.from(this.grid.children).forEach((img)=>{img.src = img.frames[this.frame]})
 
-        const fps = app.ui.settings.getSettingValue("ImageFilter.Video.FPS")
+        const fps = app.ui.settings.getSettingValue("Image Filter.Video.FPS")
         const delay = (fps>0) ? 1000/fps : 1000
         setTimeout(this.advance_videos.bind(this), delay)
     }
@@ -460,7 +460,7 @@ class Popup extends HTMLSpanElement {
             return
         }
         const s = `${n}`
-        if (app.ui.settings.getSettingValue("ImageFilter.Actions.ClickSends")) {
+        if (app.ui.settings.getSettingValue("Image Filter.Actions.Click Sends")) {
             this.picked.add(s)
             this._send_response()
         } else {