diff --git a/src/components/JournalView/JournalTimetables/EntryDetails.vue b/src/components/JournalView/JournalTimetables/EntryDetails.vue
index 2d4fef0..35c27e2 100644
--- a/src/components/JournalView/JournalTimetables/EntryDetails.vue
+++ b/src/components/JournalView/JournalTimetables/EntryDetails.vue
@@ -138,7 +138,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
+import { computed, PropType, ref } from 'vue';
 import { RouteLocationRaw } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -156,8 +156,8 @@ const props = defineProps({
     required: true
   },
 
-  timetableId: {
-    type: Number,
+  timetableEntry: {
+    type: Object as PropType<API.TimetableHistory.DataShort>,
     required: true
   }
 });
@@ -188,12 +188,12 @@ const stockHistory = computed(() => {
 });
 
 const driverRouteLocation = computed<RouteLocationRaw | null>(() => {
-  if (!timetableDetails.value || timetableDetails.value.terminated) return null;
+  if (props.timetableEntry.terminated) return null;
 
   return {
     name: 'DriverView',
     query: {
-      trainId: `${timetableDetails.value.driverId}|${timetableDetails.value.trainNo}|eu`
+      trainId: `${props.timetableEntry.driverId}|${props.timetableEntry.trainNo}|eu`
     }
   };
 });
@@ -204,7 +204,7 @@ async function fetchTimetableDetails() {
       'api/getTimetables',
       {
         params: {
-          timetableId: props.timetableId,
+          timetableId: props.timetableEntry.id,
           returnType: 'detailed'
         }
       }
diff --git a/src/components/JournalView/JournalTimetables/JournalTimetableEntry.vue b/src/components/JournalView/JournalTimetables/JournalTimetableEntry.vue
index ffc3700..8540c35 100644
--- a/src/components/JournalView/JournalTimetables/JournalTimetableEntry.vue
+++ b/src/components/JournalView/JournalTimetables/JournalTimetableEntry.vue
@@ -17,7 +17,7 @@
 
     <!-- Extra -->
     <EntryDetails
-      :timetable-id="timetableEntry.id"
+      :timetableEntry="timetableEntry"
       :show-extra-info="showExtraInfo"
       @toggle-extra-info="toggleExtraInfo"
     />
diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue
index 7936314..1e7986d 100644
--- a/src/views/JournalTimetables.vue
+++ b/src/views/JournalTimetables.vue
@@ -151,8 +151,6 @@ export default defineComponent({
 
     chosenPlayerId: -1,
 
-    currentOptionsActive: false,
-
     timetableHistory: [] as API.TimetableHistory.ResponseShort,
 
     dataStatus: Status.Data.Loading
@@ -202,17 +200,11 @@ export default defineComponent({
     };
   },
 
-  watch: {
-    currentQueryParams(q: API.TimetableHistory.QueryParams) {
-      console.log(q);
-      this.currentOptionsActive = Object.values(q).some((v) => v !== undefined);
-    },
-
-    '$route.query': {
-      deep: true,
-      handler() {
-        this.extraInfoIndexes.length = 0;
-      }
+  computed: {
+    currentOptionsActive() {
+      return Object.keys(this.currentQueryParams)
+        .filter((k) => k != 'countFrom' && k != 'returnType')
+        .some((k) => (this.currentQueryParams as any)[k] !== undefined);
     }
   },
 
@@ -303,6 +295,8 @@ export default defineComponent({
     },
 
     async fetchHistoryData() {
+      this.extraInfoIndexes.length = 0;
+
       const driverName = this.searchersValues['search-driver'].trim() || undefined;
       const trainNo = this.searchersValues['search-train'].trim() || undefined;
       const authorName = this.searchersValues['search-dispatcher'].trim() || undefined;