diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp
index 4f50dbdf4..1b3fa34c2 100644
--- a/src/blackcore/data/globalsetup.cpp
+++ b/src/blackcore/data/globalsetup.cpp
@@ -55,7 +55,7 @@ namespace BlackCore
         CUrlList CGlobalSetup::getSwiftAirportUrls() const
         {
             // currently subdir of shared, this might change
-            const CUrlList airportUrls(getSwiftSharedUrls().appendPath("/airports/airports.json"));
+            const CUrlList airportUrls(getSwiftSharedUrls().appendPath(versionString() + "/airports/airports.json"));
             return airportUrls;
         }
 
@@ -249,6 +249,8 @@ namespace BlackCore
                 return CVariant::fromValue(this->getBootstrapFileUrls());
             case IndexSwiftDbFiles:
                 return CVariant::fromValue(this->getSwiftDbDataFileLocationUrls());
+            case IndexSwiftAirportUrls:
+                return CVariant::fromValue(this->getSwiftAirportUrls());
             case IndexShared:
                 return CVariant::fromValue(this->m_sharedUrls);
             case IndexWasLoaded:
@@ -304,9 +306,9 @@ namespace BlackCore
 
         const QString &CGlobalSetup::versionString()
         {
+            // This not the current swift version, but the schema version
             static const QString v("0.7.0");
             return v;
         }
-
     } // ns
 } // ns
diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h
index 576196ec5..1b6d18864 100644
--- a/src/blackcore/data/globalsetup.h
+++ b/src/blackcore/data/globalsetup.h
@@ -48,6 +48,7 @@ namespace BlackCore
                 IndexVatsimMetars,
                 IndexVatsimData,
                 IndexSwiftDbFiles,
+                IndexSwiftAirportUrls,
                 IndexBootstrap,
                 IndexUpdateInfo,
                 IndexWasLoaded,