diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index db26715..c176c27 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -48,7 +48,7 @@
       <transition-group name="list-anim">
         <div
           style="padding-bottom: 5em"
-          v-if="apiStore.dataStatuses.trains == 0 && computedScheduledTrains.length == 0"
+          v-if="apiStore.dataStatuses.connection == 0 && computedScheduledTrains.length == 0"
           key="list-loading"
         >
           <Loading />
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 10a7145..74db8d7 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -279,7 +279,7 @@
       </table>
     </div>
 
-    <Loading v-if="apiStore.dataStatuses.sceneries == Status.Loading" />
+    <Loading v-if="apiStore.dataStatuses.connection == Status.Loading" />
 
     <div class="no-stations" v-else-if="stations.length == 0">
       {{ $t('sceneries.no-stations') }}
diff --git a/src/components/TrainsView/TrainStats.vue b/src/components/TrainsView/TrainStats.vue
index 1ac8629..8b603d0 100644
--- a/src/components/TrainsView/TrainStats.vue
+++ b/src/components/TrainsView/TrainStats.vue
@@ -16,7 +16,7 @@
 
         <hr style="margin: 0.5em 0" />
 
-        <div v-if="apiStore.dataStatuses.trains == Status.Loaded && regionTrains.length > 0">
+        <div v-if="apiStore.dataStatuses.connection == Status.Loaded && regionTrains.length > 0">
           <div class="top-list general">
             <transition-group tag="ul" name="stats-anim">
               <li class="badge" key="timetable-count">
@@ -88,7 +88,7 @@
           </div>
         </div>
 
-        <div v-else-if="apiStore.dataStatuses.trains != Status.Loaded">
+        <div v-else-if="apiStore.dataStatuses.connection != Status.Loaded">
           {{ $t('train-stats.stats-loading') }}
         </div>
 
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index d84ae0b..3db7e5f 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -1,14 +1,11 @@
 <template>
   <transition name="status-anim" mode="out-in" tag="div" class="train-table">
-    <div :key="apiStore.dataStatuses.trains">
+    <div :key="apiStore.dataStatuses.connection">
       <div class="table-info" key="offline" v-if="store.isOffline">
         {{ $t('app.offline') }}
       </div>
 
-      <Loading
-        v-else-if="trains.length == 0 && apiStore.dataStatuses.connection == 0"
-        key="loading"
-      />
+      <Loading v-else-if="apiStore.dataStatuses.connection == Status.Loading" key="loading" />
 
       <div class="table-info" key="no-trains" v-else-if="trains.length == 0">
         {{ $t('trains.no-trains') }}
@@ -63,6 +60,7 @@ export default defineComponent({
       searchedDriver,
       store,
       apiStore,
+      Status: Status.Data,
       sorterActive: inject('sorterActive') as {
         id: string | number;
         dir: number;
@@ -74,7 +72,7 @@ export default defineComponent({
     dataStatus() {
       if (this.store.isOffline) return Status.Data.Offline;
 
-      if (this.trains.length == 0 && this.apiStore.dataStatuses.trains == Status.Data.Loading)
+      if (this.trains.length == 0 && this.apiStore.dataStatuses.connection == Status.Data.Loading)
         return Status.Data.Loading;
 
       return Status.Data.Loaded;
diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue
index d79e836..53a8bfe 100644
--- a/src/views/SceneryView.vue
+++ b/src/views/SceneryView.vue
@@ -1,16 +1,5 @@
 <template>
   <div class="scenery-view">
-    <!-- <div
-      class="scenery-offline"
-      v-if="!stationInfo && !onlineSceneryInfo && store.dataStatuses.sceneries == 2"
-    >
-      <div>{{ $t('scenery.no-scenery') }}</div>
-
-      <action-button>
-        <router-link to="/">{{ $t('scenery.return-btn') }}</router-link>
-      </action-button>
-    </div> -->
-
     <div class="scenery-wrapper" ref="card-wrapper">
       <div class="scenery-left">
         <div class="scenery-actions">
@@ -43,7 +32,7 @@
         <div
           v-if="
             apiStore.dataStatuses.sceneries == Status.Loading ||
-            apiStore.dataStatuses.trains == Status.Loading
+            apiStore.dataStatuses.connection == Status.Loading
           "
         ></div>