diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/daytrip_controller.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/daytrip_controller.js
index 0c60c48d..ef1be2cf 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/daytrip_controller.js
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/daytrip_controller.js
@@ -1,5 +1,4 @@
 import { Controller } from '@hotwired/stimulus'
-import { useDispatch } from 'stimulus-use'
 import { useFetch } from '../mixins/use_fetch'
 
 export default class extends Controller {
@@ -21,13 +20,17 @@ export default class extends Controller {
     }
 
     initialize() {
-        useDispatch(this)
         useFetch(this)
     }
 
     openModal({ params }) {
         let eventName = `${params.type}-modal:open`
-        this.dispatch(eventName, params.uid)
+        this.dispatch(eventName, {
+            detail: {
+                type: params.type,
+                uid: params.uid
+            }
+        })
     }
 
     load(e) {
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/modal_controller.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/modal_controller.js
index 478ce821..0fbd109a 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/modal_controller.js
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/modal_controller.js
@@ -4,10 +4,10 @@ export default class extends Controller {
 
     static targets = [ 'content' ]
 
-    open(e) {
+    open({ detail: { uid } }) {
         this.contentTargets.forEach(element => {
-            let uid = parseInt(element.dataset.uid)
-            element.classList.toggle('hidden', e.detail !== uid)
+            let elementUid = parseInt(element.dataset.uid)
+            element.classList.toggle('hidden', uid !== elementUid)
         })
         this.element.classList.remove('hidden')
     }
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/pricetable_controller.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/pricetable_controller.js
index 1f58e971..2840d710 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/pricetable_controller.js
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/pricetable_controller.js
@@ -1,5 +1,4 @@
 import { Controller } from '@hotwired/stimulus'
-import { useDispatch } from 'stimulus-use'
 
 export default class extends Controller {
 
@@ -19,10 +18,6 @@ export default class extends Controller {
         iconSpriteUrl: String,
     }
 
-    initialize() {
-        useDispatch(this)
-    }
-
     toggleSurcharge() {
         this.modeValue = this.modeValue === 'surcharge' ? '' : 'surcharge'
     }
@@ -37,7 +32,12 @@ export default class extends Controller {
 
     openModal({ params }) {
         let eventName = `${params.type}-modal:open`
-        this.dispatch(eventName, params.uid)
+        this.dispatch(eventName, {
+            detail: {
+                type: params.type,
+                uid: params.uid
+            }
+        })
     }
 
     modeValueChanged() {
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html
index 67ca036a..298ec8be 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html
@@ -85,8 +85,8 @@
                                     <f:if condition="{row.optionalServices} && {row.available}">
                                         <button type="button"
                                                 data-action="pricetable#openModal"
-                                                data-type="options"
-                                                data-uid="{row.roomUid}"
+                                                data-pricetable-type-param="options"
+                                                data-pricetable-uid-param="{row.roomUid}"
                                                 data-cooltipz-dir="top"
                                                 aria-label="Alle Zusatzleistungen anzeigen"
                                                 role="tooltip">