diff --git a/Gruntfile.js b/Gruntfile.js
index d93e0650..60f688fa 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -172,7 +172,7 @@ module.exports = function (grunt) {
       },
       module_no_pro: {
         src: jsCoreFilesToCombine,
-        dest: 'dist/module/no-pro.js',
+        dest: 'dist/module/no-pro/index.js',
         options: {
           stripBanners: true,
           banner: "import { tzlib_get_ical_block, tzlib_get_offset, tzlib_get_timezones } from 'timezones-ical-library';\r\n",
@@ -182,7 +182,7 @@ module.exports = function (grunt) {
       },
       module_unstyle: {
         src: jsCoreFilesToCombinePro,
-        dest: 'dist/module/unstyle.js',
+        dest: 'dist/module/unstyle/index.js',
         options: {
           stripBanners: true,
           banner: "import { tzlib_get_ical_block, tzlib_get_offset, tzlib_get_timezones } from 'timezones-ical-library';\r\n",
@@ -192,7 +192,7 @@ module.exports = function (grunt) {
       },
       module_no_pro_unstyle: {
         src: jsCoreFilesToCombine,
-        dest: 'dist/module/no-pro-unstyle.js',
+        dest: 'dist/module/no-pro-unstyle/index.js',
         options: {
           stripBanners: true,
           banner: "import { tzlib_get_ical_block, tzlib_get_offset, tzlib_get_timezones } from 'timezones-ical-library';\r\n",
@@ -212,7 +212,7 @@ module.exports = function (grunt) {
       },
       commonJS_no_pro: {
         src: jsCoreFilesToCombine,
-        dest: 'dist/commonjs/no-pro.js',
+        dest: 'dist/commonjs/no-pro/index.js',
         options: {
           stripBanners: true,
           banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
@@ -222,7 +222,7 @@ module.exports = function (grunt) {
       },
       commonJS_unstyle: {
         src: jsCoreFilesToCombinePro,
-        dest: 'dist/commonjs/unstyle.js',
+        dest: 'dist/commonjs/unstyle/index.js',
         options: {
           stripBanners: true,
           banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
@@ -232,7 +232,7 @@ module.exports = function (grunt) {
       },
       commonJS_no_pro_unstyle: {
         src: jsCoreFilesToCombine,
-        dest: 'dist/commonjs/no-pro-unstyle.js',
+        dest: 'dist/commonjs/no-pro-unstyle/index.js',
         options: {
           stripBanners: true,
           banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
diff --git a/demo/package-lock.json b/demo/package-lock.json
index 13acc038..1611010f 100644
--- a/demo/package-lock.json
+++ b/demo/package-lock.json
@@ -51,7 +51,7 @@
       }
     },
     "..": {
-      "version": "2.5.0-next.1",
+      "version": "2.5.0-next.2",
       "license": "ELv2",
       "dependencies": {
         "timezones-ical-library": "^1.7.1"
diff --git a/demo/pages/advanced-use.vue b/demo/pages/advanced-use.vue
index e569833d..134eb686 100644
--- a/demo/pages/advanced-use.vue
+++ b/demo/pages/advanced-use.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { atcb_action } from "add-to-calendar-button";
+import { atcb_action } from "add-to-calendar-button/unstyle";
 import { ArrowTopRightOnSquareIcon } from '@heroicons/vue/24/outline';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import CodeBlock from "@/components/codeBlock.vue";
diff --git a/index.d.ts b/index.d.ts
index 03bc86d5..e9545164 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -1,5 +1,36 @@
 /* eslint-disable no-unused-vars */
 
+// MODULES
+// default
+declare module 'add-to-calendar-button' {
+  export function atcb_action(config: ATCBActionEventConfig, triggerElement?: HTMLElement, keyboardTrigger?: boolean): Promise<string>;
+  export const i18nStrings: {
+    [key: string]: {
+      [key: string]: string;
+    };
+  };
+  export const cssStyles: {
+    [key: string]: string;
+  };
+  export function atcb_generate_ty(host: HTMLElement, data: object): null;
+}
+
+// no-pro
+declare module 'add-to-calendar-button/no-pro' {
+  export function atcb_action(config: ATCBActionEventConfig, triggerElement?: HTMLElement, keyboardTrigger?: boolean): Promise<string>;
+}
+
+// unstyle
+declare module 'add-to-calendar-button/unstyle' {
+  export function atcb_action(config: ATCBActionEventConfig, triggerElement?: HTMLElement, keyboardTrigger?: boolean): Promise<string>;
+  export function atcb_generate_ty(host: HTMLElement, data: object): null;
+}
+
+// no-pro-unstyle
+declare module 'add-to-calendar-button/no-pro-unstyle' {
+  export function atcb_action(config: ATCBActionEventConfig, triggerElement?: HTMLElement, keyboardTrigger?: boolean): Promise<string>;
+}
+
 // INTERFACES
 interface ATCBActionEventConfig {
   proKey?: string;
@@ -82,34 +113,3 @@ interface EventDate {
 export type CustomLabelsObjectType = {
   [key: string]: string | null;
 };
-
-// MODULES
-// default
-declare module 'add-to-calendar-button' {
-  export const i18nStrings: {
-    [key: string]: {
-      [key: string]: string;
-    };
-  };
-  export const cssStyles: {
-    [key: string]: string;
-  };
-  export function atcb_generate_ty(host: HTMLElement, data: object): null;
-  export function atcb_action(config: ATCBActionEventConfig, triggerElement?: HTMLElement, keyboardTrigger?: boolean): string;
-}
-
-// no-pro
-declare module 'add-to-calendar-button/no-pro' {
-  export function atcb_action(config: ATCBActionEventConfig, triggerElement?: HTMLElement, keyboardTrigger?: boolean): string;
-}
-
-// unstyle
-declare module 'add-to-calendar-button/unstyle' {
-  export function atcb_generate_ty(host: HTMLElement, data: object): null;
-  export function atcb_action(config: ATCBActionEventConfig, triggerElement?: HTMLElement, keyboardTrigger?: boolean): string;
-}
-
-// no-pro-unstyle
-declare module 'add-to-calendar-button/no-pro-unstyle' {
-  export function atcb_action(config: ATCBActionEventConfig, triggerElement?: HTMLElement, keyboardTrigger?: boolean): string;
-}
diff --git a/package-lock.json b/package-lock.json
index ead4df32..a524edb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "add-to-calendar-button",
-  "version": "2.5.0",
+  "version": "2.5.0-next.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "add-to-calendar-button",
-      "version": "2.5.0",
+      "version": "2.5.0-next.2",
       "license": "ELv2",
       "dependencies": {
         "timezones-ical-library": "^1.7.1"
diff --git a/package.json b/package.json
index 2a7ed0cf..9bf60034 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "add-to-calendar-button",
-  "version": "2.5.0-next.1",
+  "version": "2.5.0-next.2",
   "engines": {
     "node": ">=16.18.1",
     "npm": ">=8.19.2"
@@ -23,16 +23,16 @@
       "require": "./dist/commonjs/index.js"
     },
     "./no-pro": {
-      "import": "./dist/module/no-pro.js",
-      "require": "./dist/commonjs/no-pro.js"
+      "import": "./dist/module/no-pro/index.js",
+      "require": "./dist/commonjs/no-pro/index.js"
     },
     "./unstyle": {
-      "import": "./dist/module/unstyle.js",
-      "require": "./dist/commonjs/unstyle.js"
+      "import": "./dist/module/unstyle/index.js",
+      "require": "./dist/commonjs/unstyle/index.js"
     },
     "./no-pro-unstyle": {
-      "import": "./dist/module/no-pro-unstyle.js",
-      "require": "./dist/commonjs/no-pro-unstyle.js"
+      "import": "./dist/module/no-pro-unstyle/index.js",
+      "require": "./dist/commonjs/no-pro-unstyle/index.js"
     }
   },
   "types": "index.d.ts",
diff --git a/src/atcb-decorate.js b/src/atcb-decorate.js
index 2341cd80..a3af6881 100644
--- a/src/atcb-decorate.js
+++ b/src/atcb-decorate.js
@@ -128,14 +128,14 @@ function atcb_decorate_data_options(data) {
   // define the actual options to check
   const theOptions = (function () {
     if (atcbIsiOS() || data.fakeIOS) {
-      if (data.optionsIOS && data.optionsIOS.length > 0) {
+      if (data.optionsIOS) {
         return data.optionsIOS;
       }
-      if (data.optionsMobile && data.optionsMobile.length > 0) {
+      if (data.optionsMobile) {
         return data.optionsMobile;
       }
     }
-    if ((atcbIsAndroid() || data.fakeMobile || data.fakeAndroid) && data.optionsMobile && data.optionsMobile.length > 0) {
+    if ((atcbIsAndroid() || data.fakeMobile || data.fakeAndroid) && data.optionsMobile) {
       return data.optionsMobile;
     }
     return data.options || ['ical'];
diff --git a/src/atcb-generate-pro.js b/src/atcb-generate-pro.js
index a48b15c2..027bc9c6 100644
--- a/src/atcb-generate-pro.js
+++ b/src/atcb-generate-pro.js
@@ -460,124 +460,128 @@ async function atcb_generate_rsvp(host, data, keyboardTrigger = false, inline =
   const rsvpFormSubmit = rsvpHost.getElementById('pro-form-submit');
   const rsvpFormSubmitting = rsvpHost.getElementById('pro-form-submitting');
   const rsvpRestart = rsvpHost.getElementById('pro-form-restart');
-  rsvpFormSubmit.addEventListener('click', async function (e) {
-    e.preventDefault();
-    rsvpFormSubmitting.style.display = 'block';
-    rsvpFormSubmit.style.display = 'none';
-    const staticFields = [
-      { type: 'email', name: data.proKey + '-email', fieldId: data.identifier + '-rsvp-email', required: true },
-      { type: 'number', name: data.proKey + '-amount', fieldId: data.identifier + '-rsvp-amount', required: true },
-    ];
-    let valid = atcb_validate_form(rsvpHost, [...staticFields, ...rsvpData.fields]);
-    // if maxpp, make sure amount is not bigger
-    const amountEl = rsvpHost.getElementById(data.identifier + '-rsvp-amount');
-    const amount = parseInt(amountEl.value) || 1;
-    if (rsvpData.maxpp && rsvpData.maxpp > 0 && amount > rsvpData.maxpp) {
-      amountEl.classList.add('error');
-      valid = false;
-    }
-    if (!valid) {
-      errorMsg.textContent = atcb_translate_hook('form.error.required', data) + '.';
-    }
-    // submit data
-    if (valid) {
-      if (!data.proKey || data.proKey === '') {
-        // if no prokey, we just show a demo success message
-        rsvpHost.getElementById('rsvp-success-msg-demo').style.display = 'block';
-        rsvpHost.getElementById('rsvp-content').style.display = 'none';
-        atcb_log_event('successRSVP', data.identifier, data.identifier);
-        if (cancelBtn) cancelBtn.style.display = 'none';
-        if (closeBtn) closeBtn.style.display = 'block';
-        return;
+  if (rsvpFormSubmit) {
+    rsvpFormSubmit.addEventListener('click', async function (e) {
+      e.preventDefault();
+      rsvpFormSubmitting.style.display = 'block';
+      rsvpFormSubmit.style.display = 'none';
+      const staticFields = [
+        { type: 'email', name: data.proKey + '-email', fieldId: data.identifier + '-rsvp-email', required: true },
+        { type: 'number', name: data.proKey + '-amount', fieldId: data.identifier + '-rsvp-amount', required: true },
+      ];
+      let valid = atcb_validate_form(rsvpHost, [...staticFields, ...rsvpData.fields]);
+      // if maxpp, make sure amount is not bigger
+      const amountEl = rsvpHost.getElementById(data.identifier + '-rsvp-amount');
+      const amount = parseInt(amountEl.value) || 1;
+      if (rsvpData.maxpp && rsvpData.maxpp > 0 && amount > rsvpData.maxpp) {
+        amountEl.classList.add('error');
+        valid = false;
       }
-      const bodyData = [];
-      bodyData.push({ name: 'prokey', value: data.proKey });
-      bodyData.push({ name: 'language', value: data.language });
-      const statusValEl = rsvpHost.querySelector('[name="' + data.proKey + '-status"]:checked');
-      bodyData.push({ name: 'status', value: statusValEl ? statusValEl.value : 'confirmed' });
-      bodyData.push({ name: 'amount', value: amount });
-      bodyData.push({ name: 'email', value: rsvpHost.getElementById(data.identifier + '-rsvp-email').value });
-      const bodyData_payload = {};
-      let skipRadio = false;
-      rsvpData.fields.forEach((field) => {
-        // push fields to data array except for labels - for radio buttons, we only push the checked one
-        if (field.type !== 'label') {
-          if (field.type === 'radio') {
-            if (!skipRadio) {
-              const radioGroup = rsvpHost.querySelectorAll('[name="' + field.name + '"]');
-              radioGroup.forEach(function (radio) {
-                if (radio.checked) {
-                  bodyData_payload[field.name] = radio.value;
-                }
-              });
-              skipRadio = true;
+      if (!valid) {
+        errorMsg.textContent = atcb_translate_hook('form.error.required', data) + '.';
+      }
+      // submit data
+      if (valid) {
+        if (!data.proKey || data.proKey === '') {
+          // if no prokey, we just show a demo success message
+          rsvpHost.getElementById('rsvp-success-msg-demo').style.display = 'block';
+          rsvpHost.getElementById('rsvp-content').style.display = 'none';
+          atcb_log_event('successRSVP', data.identifier, data.identifier);
+          if (cancelBtn) cancelBtn.style.display = 'none';
+          if (closeBtn) closeBtn.style.display = 'block';
+          return;
+        }
+        const bodyData = [];
+        bodyData.push({ name: 'prokey', value: data.proKey });
+        bodyData.push({ name: 'language', value: data.language });
+        const statusValEl = rsvpHost.querySelector('[name="' + data.proKey + '-status"]:checked');
+        bodyData.push({ name: 'status', value: statusValEl ? statusValEl.value : 'confirmed' });
+        bodyData.push({ name: 'amount', value: amount });
+        bodyData.push({ name: 'email', value: rsvpHost.getElementById(data.identifier + '-rsvp-email').value });
+        const bodyData_payload = {};
+        let skipRadio = false;
+        rsvpData.fields.forEach((field) => {
+          // push fields to data array except for labels - for radio buttons, we only push the checked one
+          if (field.type !== 'label') {
+            if (field.type === 'radio') {
+              if (!skipRadio) {
+                const radioGroup = rsvpHost.querySelectorAll('[name="' + field.name + '"]');
+                radioGroup.forEach(function (radio) {
+                  if (radio.checked) {
+                    bodyData_payload[field.name] = radio.value;
+                  }
+                });
+                skipRadio = true;
+              }
+            } else if (field.type === 'checkbox') {
+              bodyData_payload[field.name] = rsvpHost.getElementById(field.fieldId).checked;
+              skipRadio = false;
+            } else {
+              bodyData_payload[field.name] = rsvpHost.getElementById(field.fieldId).value;
+              skipRadio = false;
             }
-          } else if (field.type === 'checkbox') {
-            bodyData_payload[field.name] = rsvpHost.getElementById(field.fieldId).checked;
-            skipRadio = false;
+          }
+        });
+        if (Object.keys(bodyData_payload).length > 0) {
+          bodyData.push({ name: 'payload', value: bodyData_payload });
+        }
+        const request = await sendPostRequest('https://rsvp.add-to-calendar-pro.com/24586219-9910-41fe-9b59-df53de9db7af', bodyData, { rsvp: true });
+        if (request === 'doi' || request === true) {
+          rsvpHost.getElementById('rsvp-success-msg').style.display = 'block';
+          if (request === 'doi') {
+            rsvpHost.getElementById('rsvp-success-msg-doi').style.display = 'block';
           } else {
-            bodyData_payload[field.name] = rsvpHost.getElementById(field.fieldId).value;
-            skipRadio = false;
+            rsvpHost.getElementById('rsvp-success-msg-email').style.display = 'block';
           }
+          rsvpHost.getElementById('rsvp-content').style.display = 'none';
+          if (cancelBtn) cancelBtn.style.display = 'none';
+          if (closeBtn) closeBtn.style.display = 'block';
+          atcb_log_event('successRSVP', data.identifier, data.identifier);
+          localStorage.setItem(data.proKey + '-rsvp-sent', true);
+          return;
         }
-      });
-      if (Object.keys(bodyData_payload).length > 0) {
-        bodyData.push({ name: 'payload', value: bodyData_payload });
-      }
-      const request = await sendPostRequest('https://rsvp.add-to-calendar-pro.com/24586219-9910-41fe-9b59-df53de9db7af', bodyData, { rsvp: true });
-      if (request === 'doi' || request === true) {
-        rsvpHost.getElementById('rsvp-success-msg').style.display = 'block';
-        if (request === 'doi') {
-          rsvpHost.getElementById('rsvp-success-msg-doi').style.display = 'block';
+        if (request.error && request.error === 2) {
+          errorMsg.textContent = atcb_translate_hook('form.error.email', data) + '.';
+        } else if (request.error && request.error === 5) {
+          errorMsg.textContent = atcb_translate_hook('label.rsvp.expired', data) + '.';
+        } else if (request.error && request.error === 6) {
+          if (amount > 1) {
+            errorMsg.textContent = atcb_translate_hook('form.error.bookedoutmany', data) + '.';
+          } else {
+            errorMsg.textContent = atcb_translate_hook('label.rsvp.bookedout', data) + '.';
+          }
         } else {
-          rsvpHost.getElementById('rsvp-success-msg-email').style.display = 'block';
+          errorMsg.textContent = atcb_translate_hook('form.error.sending', data) + '.';
         }
-        rsvpHost.getElementById('rsvp-content').style.display = 'none';
-        if (cancelBtn) cancelBtn.style.display = 'none';
-        if (closeBtn) closeBtn.style.display = 'block';
-        atcb_log_event('successRSVP', data.identifier, data.identifier);
-        localStorage.setItem(data.proKey + '-rsvp-sent', true);
-        return;
       }
-      if (request.error && request.error === 2) {
-        errorMsg.textContent = atcb_translate_hook('form.error.email', data) + '.';
-      } else if (request.error && request.error === 5) {
-        errorMsg.textContent = atcb_translate_hook('label.rsvp.expired', data) + '.';
-      } else if (request.error && request.error === 6) {
-        if (amount > 1) {
-          errorMsg.textContent = atcb_translate_hook('form.error.bookedoutmany', data) + '.';
-        } else {
-          errorMsg.textContent = atcb_translate_hook('label.rsvp.bookedout', data) + '.';
-        }
-      } else {
-        errorMsg.textContent = atcb_translate_hook('form.error.sending', data) + '.';
+      rsvpForm.classList.add('form-error');
+      rsvpFormSubmitting.style.display = 'none';
+      rsvpFormSubmit.style.display = 'block';
+    });
+    rsvpFormSubmit.addEventListener('keyup', function (event) {
+      if (event.key === 'Enter') {
+        event.preventDefault();
+        rsvpFormSubmit.click();
       }
-    }
-    rsvpForm.classList.add('form-error');
-    rsvpFormSubmitting.style.display = 'none';
-    rsvpFormSubmit.style.display = 'block';
-  });
-  rsvpFormSubmit.addEventListener('keyup', function (event) {
-    if (event.key === 'Enter') {
-      event.preventDefault();
-      rsvpFormSubmit.click();
-    }
-  });
+    });
+  }
   // reset
-  rsvpRestart.addEventListener('click', function (e) {
-    e.preventDefault();
-    rsvpHost.getElementById('rsvp-sent-content').style.display = 'none';
-    rsvpHost.getElementById('rsvp-content').style.display = 'block';
-    if (closeBtn) closeBtn.style.display = 'none';
-    if (restartBtn) restartBtn.style.display = 'none';
-    if (cancelBtn) cancelBtn.style.display = 'block';
-  });
-  rsvpRestart.addEventListener('keyup', function (event) {
-    if (event.key === 'Enter') {
-      event.preventDefault();
-      rsvpRestart.click();
-    }
-  });
+  if (rsvpRestart) {
+    rsvpRestart.addEventListener('click', function (e) {
+      e.preventDefault();
+      rsvpHost.getElementById('rsvp-sent-content').style.display = 'none';
+      rsvpHost.getElementById('rsvp-content').style.display = 'block';
+      if (closeBtn) closeBtn.style.display = 'none';
+      if (restartBtn) restartBtn.style.display = 'none';
+      if (cancelBtn) cancelBtn.style.display = 'block';
+    });
+    rsvpRestart.addEventListener('keyup', function (event) {
+      if (event.key === 'Enter') {
+        event.preventDefault();
+        rsvpRestart.click();
+      }
+    });
+  }
 }
 
 // SHARED FORM FUNCTIONS
diff --git a/src/atcb-init.js b/src/atcb-init.js
index 3fa3be73..8fc4abe2 100644
--- a/src/atcb-init.js
+++ b/src/atcb-init.js
@@ -258,6 +258,10 @@ function atcb_read_attributes(el, params = atcbWcParams) {
       } else {
         val = inputVal;
       }
+      // only set, if no empty object or empty array
+      if ((typeof val === 'object' && Object.keys(val).length === 0) || (Array.isArray(val) && (val.length === 0 || (val.length === 1 && val[0] === '')))) {
+        continue;
+      }
       data[`${attr}`] = val;
     }
   }
@@ -495,7 +499,6 @@ function atcb_render_debug_msg(host, error) {
 }
 
 // prepare data when not using the web component, but some custom trigger instead
-// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
 async function atcb_action(inputData, triggerElement, keyboardTrigger = false) {
   // return if not within a browser environment
   if (!atcbIsBrowser()) {
@@ -797,4 +800,4 @@ function atcb_unset_global_event_listener(identifier) {
   }
 }
 
-export { atcb_unset_global_event_listener, atcb_load_css, atcb_set_light_mode };
+export { atcb_action, atcb_unset_global_event_listener, atcb_load_css, atcb_set_light_mode };