diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
index dc353750..ebc3e046 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
@@ -350,7 +350,9 @@ new Vue({
             });
         });
         EventBus.$on('tableLoaded', () => {
-            this.initTooltips();
+            Vue.nextTick(() => {
+                this.initTooltips();
+            });
         });
         EventBus.$on('scrollTo', (anchorId, offset) => {
             this.scrollTo(anchorId, offset);
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DateSelect.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DateSelect.vue
index fe8fe91f..5da149ba 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DateSelect.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DateSelect.vue
@@ -28,7 +28,10 @@
                             <td>
                                 <i v-if="row.skipassIncluded" data-placement="top" title="Skipass inklusive" class="fa fa-tag tooltiptoggle"></i>
                                 <a href="#" data-toggle="modal"
-                                   :data-target="'#services' + index"><i class="fa fa-info-circle"></i></a>
+                                   :data-target="'#services' + index">
+                                    <i data-placement="top" title="Inklusivleistungen zeigen"
+                                       class="fa fa-info-circle tooltiptoggle"></i>
+                                </a>
                                 <div class="modal fade" :id="'services' + index" role="dialog">
                                     <div class="modal-dialog">
                                         <div class="modal-content">
@@ -194,7 +197,7 @@
                 $.post(this.roomsEndpointUri, query, (json) => {
                     this.loading = false;
                     this.availableRooms = json;
-                    EventBus.$emit('ajaxContentLoaded');
+                    EventBus.$emit('tableLoaded');
                 }, 'json');
             }
         },