diff --git a/.env b/.env
index 80c0da7..25d40b9 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
-VITE_APP_API_URL=https://spythere.pl/api
+VITE_APP_API_URL=https://stacjownik.spythere.pl/api
 VITE_APP_SWDR_URL=https://api.td2.info.pl
\ No newline at end of file
diff --git a/package.json b/package.json
index 45095ac..b44539d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "genera-tor",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "private": true,
   "scripts": {
     "dev": "vite --port 8080",
diff --git a/src/components/OrderTrainPicker.vue b/src/components/OrderTrainPicker.vue
index e5e62ba..30917c1 100644
--- a/src/components/OrderTrainPicker.vue
+++ b/src/components/OrderTrainPicker.vue
@@ -101,6 +101,8 @@ export default defineComponent({
   },
 
   created() {
+    this.fillCheckpointName = window.localStorage.getItem('fill-checkpoint') == 'true';
+
     this.fetchSceneriesData();
   },
 
@@ -124,6 +126,10 @@ export default defineComponent({
     selectedSceneryName() {
       this.selectedCheckpointName = this.checkpointNameList.length == 0 ? null : this.checkpointNameList[0];
     },
+
+    fillCheckpointName(val: boolean) {
+      window.localStorage.setItem('fill-checkpoint', `${val}`);
+    },
   },
 
   computed: {
@@ -223,9 +229,8 @@ export default defineComponent({
       this.store.orderFooter.hour = currentFormattedHours();
       this.store.orderFooter.minutes = currentFormattedMinutes();
 
-      if (this.fillCheckpointName) {        
-        const sceneryAbbrev = this.sceneriesData.find(({ name }) => name === this.store.orderFooter.stationName)?.abbr;
-
+      if (this.fillCheckpointName) {
+        const sceneryAbbrev = this.sceneriesData.find(({ name }) => name === this.selectedSceneryName)?.abbr;
         this.store.orderFooter.checkpointName = sceneryAbbrev || this.store.orderFooter.stationName.slice(0, 2);
       }
 
diff --git a/vite.config.ts b/vite.config.ts
index 312dfbc..6f209b2 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -15,7 +15,7 @@ export default defineConfig({
         globPatterns: ['**/*.{js,css,html,png,svg,img}'],
         runtimeCaching: [
           {
-            urlPattern: /^https:\/\/spythere.pl\/\/api\/getSceneries/i,
+            urlPattern: /^https:\/\/stacjownik.spythere.pl\/\/api\/getSceneries/i,
             handler: 'CacheFirst',
             options: {
               cacheName: 'sceneries-cache',