diff --git a/pages/addtags/mzta-add-tags.js b/pages/addtags/mzta-add-tags.js
index 50a6bd61..8da2bae2 100644
--- a/pages/addtags/mzta-add-tags.js
+++ b/pages/addtags/mzta-add-tags.js
@@ -214,16 +214,15 @@ function saveOptions(e) {
       case 'number':
         options[element.id] = element.valueAsNumber;
         break;
-        case 'text':
-        case 'password':
+      case 'text':
+      case 'password':
         options[element.id] = element.value.trim();
         break;
+      case 'select-one':
+        options[element.id] = element.value;
+        break;
       default:
-        if (element.tagName === 'SELECT') {
-          options[element.id] = element.value;
-        }else{
-          console.error("[ThunderAI] Unhandled input type:", element.type);
-        }
+        console.error("[ThunderAI] Unhandled input type:", element.type);
     }
 
   browser.storage.sync.set(options);
diff --git a/pages/get-calendar-event/mzta-get-calendar-event.js b/pages/get-calendar-event/mzta-get-calendar-event.js
index a6654632..1ca4ddab 100644
--- a/pages/get-calendar-event/mzta-get-calendar-event.js
+++ b/pages/get-calendar-event/mzta-get-calendar-event.js
@@ -97,12 +97,11 @@ function saveOptions(e) {
         case 'password':
         options[element.id] = element.value.trim();
         break;
+      case 'select-one':
+        options[element.id] = element.value;
+        break;
       default:
-        if (element.tagName === 'SELECT') {
-          options[element.id] = element.value;
-        }else{
-          console.error("[ThunderAI] Unhandled input type:", element.type);
-        }
+        console.error("[ThunderAI] Unhandled input type:", element.type);
     }
 
   browser.storage.sync.set(options);
diff --git a/pages/get-task/mzta-get-task.js b/pages/get-task/mzta-get-task.js
index 2b33e297..2dce1dcb 100644
--- a/pages/get-task/mzta-get-task.js
+++ b/pages/get-task/mzta-get-task.js
@@ -97,12 +97,11 @@ function saveOptions(e) {
         case 'password':
         options[element.id] = element.value.trim();
         break;
+      case 'select-one':
+        options[element.id] = element.value;
+        break;
       default:
-        if (element.tagName === 'SELECT') {
-          options[element.id] = element.value;
-        }else{
-          console.error("[ThunderAI] Unhandled input type:", element.type);
-        }
+        console.error("[ThunderAI] Unhandled input type:", element.type);
     }
 
   browser.storage.sync.set(options);
diff --git a/pages/spamfilter/mzta-spamfilter.js b/pages/spamfilter/mzta-spamfilter.js
index 997bd482..159b8270 100644
--- a/pages/spamfilter/mzta-spamfilter.js
+++ b/pages/spamfilter/mzta-spamfilter.js
@@ -210,12 +210,11 @@ function saveOptions(e) {
         case 'password':
         options[element.id] = element.value.trim();
         break;
+      case 'select-one':
+        options[element.id] = element.value;
+        break;
       default:
-        if (element.tagName === 'SELECT') {
-          options[element.id] = element.value;
-        }else{
-          console.error("[ThunderAI] Unhandled input type:", element.type);
-        }
+        console.error("[ThunderAI] Unhandled input type:", element.type);
     }
 
   browser.storage.sync.set(options);