diff --git a/scwx-qt/source/scwx/qt/map/map_provider.cpp b/scwx-qt/source/scwx/qt/map/map_provider.cpp
index 7207e3ba..2a431614 100644
--- a/scwx-qt/source/scwx/qt/map/map_provider.cpp
+++ b/scwx-qt/source/scwx/qt/map/map_provider.cpp
@@ -42,7 +42,7 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
                      .drawBelow_ {mapboxDrawBelow_}},
                     {.name_ {"Satellite"},
                      .url_ {"mapbox://styles/mapbox/satellite-v9"},
-                     .drawBelow_ {mapboxDrawBelow_}},
+                     .drawBelow_ {"com.mapbox.annotations.points"}},
                     {.name_ {"Satellite Streets"},
                      .url_ {"mapbox://styles/mapbox/satellite-streets-v11"},
                      .drawBelow_ {mapboxDrawBelow_}}}}},
@@ -52,51 +52,52 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
        .cacheDbName_ {"maptiler-cache.db"},
        .settingsTemplate_ {
           QMapLibreGL::Settings::SettingsTemplate::MapTilerSettings},
-       .mapStyles_ {{.name_ {"Satellite"},
-                     .url_ {"maptiler://maps/hybrid"},
-                     .drawBelow_ {"tunnel"}},
-                    {.name_ {"Streets"},
-                     .url_ {"maptiler://maps/streets-v2"},
-                     .drawBelow_ {"aeroway"}},
-                    {.name_ {"Streets Dark"},
-                     .url_ {"maptiler://maps/streets-v2-dark"},
-                     .drawBelow_ {"aeroway"}},
-                    {.name_ {"Basic"},
-                     .url_ {"maptiler://maps/basic-v2"},
-                     .drawBelow_ {"railway_transit_tunnel"}},
-                    {.name_ {"Bright"},
-                     .url_ {"maptiler://maps/bright-v2"},
-                     .drawBelow_ {"ferry"}},
-                    {.name_ {"Dataviz"},
-                     .url_ {"maptiler://maps/dataviz"},
-                     .drawBelow_ {"aeroway"}},
-                    {.name_ {"Dataviz Dark"},
-                     .url_ {"maptiler://maps/dataviz-dark"},
-                     .drawBelow_ {"aeroway"}},
-                    {.name_ {"Outdoor"},
-                     .url_ {"maptiler://maps/outdoor-v2"},
-                     .drawBelow_ {"aeroway_runway"}},
-                    {.name_ {"Swisstopo"},
-                     .url_ {"maptiler://maps/ch-swisstopo-lbm"},
-                     .drawBelow_ {"pattern_landcover_vineyard"}},
-                    {.name_ {"Swisstopo Dark"},
-                     .url_ {"maptiler://maps/ch-swisstopo-lbm-dark"},
-                     .drawBelow_ {"pattern_landcover_vineyard"}},
-                    {.name_ {"Swisstopo Grey"},
-                     .url_ {"maptiler://maps/ch-swisstopo-lbm-grey"},
-                     .drawBelow_ {"pattern_landcover_vineyard"}},
-                    {.name_ {"Swisstopo Vivid"},
-                     .url_ {"maptiler://maps/ch-swisstopo-lbm-vivid"},
-                     .drawBelow_ {"pattern_landcover_vineyard"}},
-                    {.name_ {"Topo"},
-                     .url_ {"maptiler://maps/topo-v2"},
-                     .drawBelow_ {"aeroway_runway"}},
-                    {.name_ {"Topo Dark"},
-                     .url_ {"maptiler://maps/topo-v2-dark"},
-                     .drawBelow_ {"aeroway_runway"}},
-                    {.name_ {"Winter"},
-                     .url_ {"maptiler://maps/winter-v2"},
-                     .drawBelow_ {"aeroway_runway"}}}}},
+       .mapStyles_ {
+          {.name_ {"Satellite"},
+           .url_ {"maptiler://maps/hybrid"},
+           .drawBelow_ {"tunnel"}},
+          {.name_ {"Streets"},
+           .url_ {"maptiler://maps/streets-v2"},
+           .drawBelow_ {"aeroway"}},
+          {.name_ {"Streets Dark"},
+           .url_ {"maptiler://maps/streets-v2-dark"},
+           .drawBelow_ {"aeroway"}},
+          {.name_ {"Basic"},
+           .url_ {"maptiler://maps/basic-v2"},
+           .drawBelow_ {"railway_transit_tunnel", "Transit tunnel"}},
+          {.name_ {"Bright"},
+           .url_ {"maptiler://maps/bright-v2"},
+           .drawBelow_ {"ferry"}},
+          {.name_ {"Dataviz"},
+           .url_ {"maptiler://maps/dataviz"},
+           .drawBelow_ {"aeroway"}},
+          {.name_ {"Dataviz Dark"},
+           .url_ {"maptiler://maps/dataviz-dark"},
+           .drawBelow_ {"aeroway"}},
+          {.name_ {"Outdoor"},
+           .url_ {"maptiler://maps/outdoor-v2"},
+           .drawBelow_ {"aeroway_runway", "Aeroway"}},
+          {.name_ {"Swisstopo"},
+           .url_ {"maptiler://maps/ch-swisstopo-lbm"},
+           .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
+          {.name_ {"Swisstopo Dark"},
+           .url_ {"maptiler://maps/ch-swisstopo-lbm-dark"},
+           .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
+          {.name_ {"Swisstopo Grey"},
+           .url_ {"maptiler://maps/ch-swisstopo-lbm-grey"},
+           .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
+          {.name_ {"Swisstopo Vivid"},
+           .url_ {"maptiler://maps/ch-swisstopo-lbm-vivid"},
+           .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
+          {.name_ {"Topo"},
+           .url_ {"maptiler://maps/topo-v2"},
+           .drawBelow_ {"aeroway_runway", "Runway"}},
+          {.name_ {"Topo Dark"},
+           .url_ {"maptiler://maps/topo-v2-dark"},
+           .drawBelow_ {"aeroway_runway", "Runway"}},
+          {.name_ {"Winter"},
+           .url_ {"maptiler://maps/winter-v2"},
+           .drawBelow_ {"aeroway_runway", "Aeroway"}}}}},
    {MapProvider::Unknown, MapProviderInfo {}}};
 
 MapProvider GetMapProvider(const std::string& name)