diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue
index 50f3f18..308112c 100644
--- a/src/components/SceneryView/SceneryInfo.vue
+++ b/src/components/SceneryView/SceneryInfo.vue
@@ -242,7 +242,7 @@ export default defineComponent({
     navigateToTrain(trainNo: number) {
       this.$router.push({
         name: "TrainsView",
-        params: { train: trainNo.toString() },
+        query: { train: trainNo.toString() },
       });
     },
   },
diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index 375265b..c8c9c45 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -51,7 +51,7 @@
             <router-link
               :to="{
                 name: 'TrainsView',
-                params: {
+                query: {
                   train: scheduledTrain.trainNo.toString(),
                 },
               }"
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index 7519ba2..ff96b75 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -169,7 +169,7 @@
         >
           <TrainSchedule
             v-if="showedSchedule === train.timetableData?.timetableId"
-            :followingStops="train.timetableData.followingStops"
+            :followingStops="train.timetableData?.followingStops"
             @click="changeScheduleShowState(train.timetableData?.timetableId)"
           />
         </transition>
@@ -188,8 +188,10 @@ import {
   computed,
   ComputedRef,
   defineComponent,
+  reactive,
   Ref,
   ref,
+  watch,
 } from "@vue/runtime-core";
 import { useStore } from "@/store";
 import { GETTERS } from "@/constants/storeConstants";
@@ -270,6 +272,20 @@ export default defineComponent({
       () => store.getters[GETTERS.timetableDataStatus]
     );
 
+    const queryTimetable = computed(
+      () =>
+        props.computedTrains.find(
+          (train) => train.trainNo === Number(props.queryTrain)
+        )?.timetableData
+    );
+
+    // watch(
+    //   () => queryTimetable.value,
+    //   (val, prevVal) => {
+
+    //   }
+    // );
+
     // const observer = new IntersectionObserver((entries) => {
     //   entries.forEach((entry) => {
     //     if (entry.isIntersecting) {
@@ -283,6 +299,7 @@ export default defineComponent({
 
     return {
       elList,
+      queryTimetable,
       timetableLoaded: computed(
         () => timetableDataStatus.value === DataStatus.Loaded
       ),
@@ -299,6 +316,14 @@ export default defineComponent({
     };
   },
 
+  // watch: {
+  //   queryTimetable(timetable: Train["timetableData"]) {
+  //     if (!timetable || !this.queryTrain) return;
+
+  //     this.focusOnTrain(this.queryTrain);
+  //   },
+  // },
+
   methods: {
     enter(el: HTMLElement) {
       const maxHeight = getComputedStyle(el).height;
@@ -323,6 +348,7 @@ export default defineComponent({
         el.style.height = "0px";
       }, 10);
     },
+
     focusOnTrain(trainNoStr: string) {
       const timetableId = this.computedTrains.find(
         (train) => train.trainNo == Number(trainNoStr)
@@ -346,7 +372,7 @@ export default defineComponent({
           behavior: "smooth",
           block: this.showedSchedule == 0 ? "nearest" : "center",
         });
-      }, 175);
+      }, 200);
     },
 
     onImageError(e: Event) {
diff --git a/src/router/index.ts b/src/router/index.ts
index 29fb2f5..bcec677 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -12,8 +12,7 @@ const routes: Array<RouteRecordRaw> = [
     path: "/trains",
     name: "TrainsView",
     component:  () => import("@/views/TrainsView.vue"),
-    props: true,
-
+    props: route => ({ train: route.query.train })
   },
   {
     path: "/scenery",
diff --git a/src/views/HistoryView.vue b/src/views/HistoryView.vue
index fccb8fd..ee26137 100644
--- a/src/views/HistoryView.vue
+++ b/src/views/HistoryView.vue
@@ -257,7 +257,7 @@ export default defineComponent({
 
       this.$router.push({
         name: "TrainsView",
-        params: { train: trainNo.toString() },
+        query: { train: trainNo.toString() },
       });
     },