diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index d8f3b4c..6aee13a 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -21,7 +21,7 @@
     </div>
 
     <transition name="scenery-timetable-list-anim" mode="out-in">
-      <div :key="timetableDataStatus + computedScheduledTrains.length">
+      <div :key="timetableDataStatus + selectedCheckpoint">
         <span class="timetable-item loading" v-if="timetableDataStatus == 0 && computedScheduledTrains.length == 0">
           {{ $t('app.loading') }}
         </span>
diff --git a/src/components/TrainsView/TrainSchedule.vue b/src/components/TrainsView/TrainSchedule.vue
index 4ef7e5b..ec28a9f 100644
--- a/src/components/TrainsView/TrainSchedule.vue
+++ b/src/components/TrainsView/TrainSchedule.vue
@@ -85,6 +85,7 @@
 <script lang="ts">
 import TrainStop from '@/scripts/interfaces/TrainStop';
 import { computed, defineComponent } from '@vue/runtime-core';
+import decodedChars from "@/data/decodedChars.json";
 
 export default defineComponent({
   props: {
@@ -145,6 +146,11 @@ export default defineComponent({
         'last-confirmed': index == this.lastConfirmed && !stop.terminatesHere,
       };
     },
+
+    decodeSWDRComment(comment: string) {
+        const test = 'kurw&#x119;a&#x119;'
+        const charsToDecode = test.split('&#x');
+    }
   },
 });
 </script>
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index f6addbe..0d773e7 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -5,13 +5,15 @@
     </div>
 
     <transition name="train-list-anim" mode="out-in">
-      <div :key="computedTrains.length+Number(timetableLoaded)">
+      <div :key="timetableLoaded">
         <div class="table-info no-trains" v-if="computedTrains.length == 0 && timetableLoaded">
           {{ $t('trains.no-trains') }}
         </div>
+
         <div class="table-info loading" v-if="computedTrains.length == 0 && !timetableLoaded">
           {{ $t('trains.loading') }}
         </div>
+
         <ul class="train-list">
           <li
             class="train-row"
@@ -33,6 +35,7 @@
                     </span>
                   </div>
                 </div>
+
                 <div class="info_timetable" v-else>
                   <div class="timetable_general">
                     <span class="timetable_hero">
@@ -40,16 +43,19 @@
                         <span class="warning twr" v-if="train.timetableData.TWR">
                           TWR
                         </span>
+
                         <span class="warning skr" v-if="train.timetableData.SKR">
                           SKR
                         </span>
                       </span>
+
                       <span>
                         <strong>{{ train.timetableData.category }}</strong>
                         {{ train.trainNo }} |
                         <span style="color: gold"> {{ train.timetableData.routeDistance }} km </span>
                       </span>
                     </span>
+
                     <span class="timetable_srjp g-tooltip">
                       <span class="activator">
                         SRJP
@@ -61,9 +67,11 @@
                       <span class="content"> {{ $t('trains.detailed-timetable') }} {{ train.trainNo }} </span>
                     </span>
                   </div>
+
                   <div class="timetable_route">
                     {{ train.timetableData.route.replace('|', ' - ') }}
                   </div>
+
                   <div class="timetable_stops">
                     <span v-if="train.timetableData.followingStops.length > 2">
                       {{ $t('trains.via-title') }}
@@ -71,6 +79,7 @@
                     </span>
                   </div>
                 </div>
+
                 <div class="info_comments" v-if="getSceneriesWithComments(train.timetableData).length > 0">
                   <img
                     :src="icons.warning"
@@ -80,6 +89,7 @@
                   />
                 </div>
               </span>
+
               <span class="driver">
                 <div class="driver-info">
                   <span class="driver-name">
@@ -109,6 +119,7 @@
                   <img v-else class="train-image" :src="train.locoURL" :alt="train.locoType" @error="onImageError" />
                 </span>
               </span>
+
               <span class="stats">
                 <div class="stats-main">
                   <span v-for="stat in stats.main" :key="stat.name">
@@ -126,6 +137,7 @@
                 </div>
               </span>
             </div>
+
             <transition name="unfold-timetable-anim" @enter="enter" @afterEnter="afterEnter" @leave="leave">
               <TrainSchedule
                 v-if="showedSchedule === train.timetableData?.timetableId"
diff --git a/src/data/decodedChars.json b/src/data/decodedChars.json
new file mode 100644
index 0000000..2f8c3f5
--- /dev/null
+++ b/src/data/decodedChars.json
@@ -0,0 +1,20 @@
+{
+    "0D3": "Ó",
+    "0F3": "ó",
+    "104": "Ą",
+    "105": "ą", 
+    "106": "Ć",
+    "107": "ć",
+    "280": "Ę",
+    "281": "ę",
+    "141": "Ł",
+    "142": "ł",
+    "143": "Ń",
+    "144": "ń",
+    "15A": "Ś",
+    "15B": "ś",
+    "179": "Ź",
+    "17A": "ź",
+    "17B": "Ż",
+    "17C": "ż"
+}
\ No newline at end of file