diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue
index f27b84b..50f3f18 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: { queryTrain: trainNo.toString() },
+        params: { train: trainNo.toString() },
       });
     },
   },
diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index a22b481..375265b 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -29,10 +29,7 @@
       ></select-box>
     </div>
 
-    <span
-      class="timetable-item loading"
-      v-if="dataStatus == 0"
-    >{{
+    <span class="timetable-item loading" v-if="dataStatus == 0">{{
       $t("app.loading")
     }}</span>
 
@@ -51,12 +48,14 @@
       >
         <span class="timetable-general">
           <span class="general-info">
-            <router-link :to="{
+            <router-link
+              :to="{
                 name: 'TrainsView',
                 params: {
-                  queryTrain: scheduledTrain.trainNo.toString(),
+                  train: scheduledTrain.trainNo.toString(),
                 },
-              }">
+              }"
+            >
               <span>
                 <strong>{{ scheduledTrain.category }}</strong>
                 {{ scheduledTrain.trainNo }}
@@ -69,17 +68,21 @@
                   'https://td2.info.pl/profile/?u=' + scheduledTrain.driverId
                 "
                 target="_blank"
-              >{{ scheduledTrain.driverName }}</a>
+                >{{ scheduledTrain.driverName }}</a
+              >
             </span>
 
             <div class="info-route">
-              <strong>{{ scheduledTrain.beginsAt }} -
-                {{ scheduledTrain.terminatesAt }}</strong>
+              <strong
+                >{{ scheduledTrain.beginsAt }} -
+                {{ scheduledTrain.terminatesAt }}</strong
+              >
             </div>
           </span>
 
           <span class="general-status">
-            <span :class="scheduledTrain.stopStatus">{{ $t(`timetables.${scheduledTrain.stopStatus}`) }}
+            <span :class="scheduledTrain.stopStatus"
+              >{{ $t(`timetables.${scheduledTrain.stopStatus}`) }}
             </span>
           </span>
         </span>
@@ -92,10 +95,7 @@
               v-html="$t('timetables.begins')"
             >
             </span>
-            <span
-              class="arrival-time"
-              v-else
-            >
+            <span class="arrival-time" v-else>
               {{ scheduledTrain.stopInfo.arrivalTimeString }} ({{
                 scheduledTrain.stopInfo.arrivalDelay
               }})
@@ -103,10 +103,7 @@
           </span>
 
           <span class="schedule-stop">
-            <span
-              class="stop-time"
-              v-if="scheduledTrain.stopInfo.stopTime"
-            >
+            <span class="stop-time" v-if="scheduledTrain.stopInfo.stopTime">
               {{ scheduledTrain.stopInfo.stopTime }}
               {{ scheduledTrain.stopInfo.stopType }}
             </span>
@@ -119,10 +116,7 @@
               v-html="$t('timetables.terminates')"
             >
             </span>
-            <span
-              class="departure-time"
-              v-else
-            >
+            <span class="departure-time" v-else>
               {{ scheduledTrain.stopInfo.departureTimeString }} ({{
                 scheduledTrain.stopInfo.departureDelay
               }})
diff --git a/src/components/TrainsView/TrainStats.vue b/src/components/TrainsView/TrainStats.vue
index 1b7a53b..e4bd90c 100644
--- a/src/components/TrainsView/TrainStats.vue
+++ b/src/components/TrainsView/TrainStats.vue
@@ -112,12 +112,14 @@ export default defineComponent({
     const speedStats = computed(() => {
       if (props.trains.length == 0) return { avg: "0", min: "0", max: "0" };
 
+      const trainList = props.trains.filter((train) => train.timetableData);
+
       const avg = (
-        props.trains.reduce((acc, train) => acc + train.speed, 0) /
-        props.trains.length
+        trainList.reduce((acc, train) => acc + train.speed, 0) /
+        trainList.length
       ).toFixed(2);
 
-      const minMaxSpeed = props.trains.reduce((acc, train) => {
+      const minMaxSpeed = trainList.reduce((acc, train) => {
         if (!train.timetableData) return acc;
 
         acc[0] = !acc[0] || train.speed < acc[0] ? train.speed : acc[0];
@@ -206,6 +208,7 @@ export default defineComponent({
       const twrList = props.trains.filter(
         (train) => train.timetableData && train.timetableData.TWR
       );
+
       const skrList = props.trains.filter(
         (train) => train.timetableData && train.timetableData.SKR
       );
diff --git a/src/views/HistoryView.vue b/src/views/HistoryView.vue
index f5f97c2..fccb8fd 100644
--- a/src/views/HistoryView.vue
+++ b/src/views/HistoryView.vue
@@ -257,7 +257,7 @@ export default defineComponent({
 
       this.$router.push({
         name: "TrainsView",
-        params: { queryTrain: trainNo.toString() },
+        params: { train: trainNo.toString() },
       });
     },
 
diff --git a/src/views/TrainsView.vue b/src/views/TrainsView.vue
index ef72fdd..269bbe8 100644
--- a/src/views/TrainsView.vue
+++ b/src/views/TrainsView.vue
@@ -5,14 +5,14 @@
         <TrainStats :trains="trainList" :trainStatsOpen="trainStatsOpen" />
 
         <TrainOptions
-          :queryTrain="queryTrain"
+          :queryTrain="train"
           @changeSorter="changeSorter"
           @changeSearchedTrain="changeSearchedTrain"
           @changeSearchedDriver="changeSearchedDriver"
         />
       </div>
 
-      <TrainTable :computedTrains="computedTrains" :queryTrain="queryTrain" />
+      <TrainTable :computedTrains="computedTrains" :queryTrain="train" />
     </div>
   </section>
 </template>
@@ -91,11 +91,12 @@ export default defineComponent({
     TrainOptions,
   },
 
-  props: ["queryTrain"],
+  props: ["train"],
 
   data: () => ({
     statsIcon: require("@/assets/icon-stats.svg"),
     trainStatsOpen: false,
+    queryTrain: "",
   }),
 
   setup() {