diff --git a/src/components/flights/FlightTrackMap.vue b/src/components/flights/FlightTrackMap.vue
index b1853ae..e319f4c 100644
--- a/src/components/flights/FlightTrackMap.vue
+++ b/src/components/flights/FlightTrackMap.vue
@@ -13,20 +13,16 @@ const props = defineProps({
 
 
 const mapPhotos = computed(() => flight.value.photos.filter(photo => photo.gpsLatitude && photo.gpsLongitude));
-const poisWithGPS = computed(() => {
-  return flight.value.track.filter(poi => {
-    const item = poi.pointOfInterest || poi.airport;
-    return item.gpsLatitude && item.gpsLongitude;
-  }).map(poi =>  poi.pointOfInterest || poi.airport)
-});
+const poisWithGPS = computed(() => flight.value.track.map(poi => poi.pointOfInterest || poi.airport));
 
 const mapMarkers = [flight.value.takeoffAirport].concat(poisWithGPS.value).concat([flight.value.landingAirport]);
-const pointsOfInterests = computed(() => mapMarkers.map(
-  marker => ({label: marker.name, position: {lat: marker.gpsLatitude, lng: marker.gpsLongitude}})
-));
+const pointsOfInterests = computed(() => mapMarkers
+  .filter(marker => marker.gpsLatitude && marker.gpsLongiture)
+  .map(
+    marker => ({label: marker.name, position: {lat: marker.gpsLatitude, lng: marker.gpsLongitude}})
+  ));
 
 const gpxTrack = flight.value.gpxTrack;
-
 const displayMap = computed(() => {
   return (
     !!gpxTrack ||
@@ -80,7 +76,7 @@ if (gpxTrack) {
 
 const currentPositionMarker = ref(null);
 const drawCurrentPositionMarker = (e) => {
-  const res = e.chart.getElementsAtEventForMode(e, 'nearest', {intersect: false},);
+  const res = e.chart.getElementsAtEventForMode(e, 'nearest', {intersect: false});
   if (res.length === 0) {
     currentPositionMarker.value = null;
     return;
diff --git a/src/components/flights/form/FlightFormTrack.vue b/src/components/flights/form/FlightFormTrack.vue
index f9562c8..40ddd2e 100644
--- a/src/components/flights/form/FlightFormTrack.vue
+++ b/src/components/flights/form/FlightFormTrack.vue
@@ -74,7 +74,7 @@ watch(() => props.flight.track, (newVal) => {
 <template>
   <FormWrapper v-model="formData">
 
-    <q-banner class="bg-green text-white" v-if="flight.gpxTrackUrl">
+    <q-banner class="bg-green text-white" v-if="flight.gpxTrack">
       <q-icon name="check"/>
       Trasa nahrána
     </q-banner>
diff --git a/src/graphql/fragments/flight.js b/src/graphql/fragments/flight.js
index f944e04..2cde488 100644
--- a/src/graphql/fragments/flight.js
+++ b/src/graphql/fragments/flight.js
@@ -47,7 +47,6 @@ fragment flightFullInfo on Flight {
     name
   }
 
-  gpxTrackUrl
   gpxTrack {
     coordinates {
       lat