diff --git a/config/trackdirect.ini b/config/trackdirect.ini
index c0522926583bdc47bcdccdc733cbb76c74b929b6..af33eed136a0f13b80c2cd1777881a40f7c794aa 100644
--- a/config/trackdirect.ini
+++ b/config/trackdirect.ini
@@ -8,15 +8,21 @@ title="APRS Track Direct"
 owner_name="Unknown"
 owner_email="no@name.com"
 
-;; Please read about usage policy for each map provider (look in index.php)
-;; If no map api keys are set you will use OpenStreetMap for raster tile (Heavy use is not allowed) 
-;: Read more about OpenStreetMap usage policy here: https://operations.osmfoundation.org/policies/tiles/)
-
 ;maptiler_key="<insert map key here if you want to activate maptiler for vector tiles>"
 ;google_key="<insert google key here if you want to activate google maps>"
 ;here_app_id="<insert HERE app_id here if you want to use HERE for raster tiles>"
 ;here_app_code="<insert HERE app_code here if you want to use HERE for raster tiles>"
 
+;; For the map type "Leaflet - Raster Tiles" we have a lot of options
+;; Please read usage policy for each map provider (OpenStreetMap usage policy: https://operations.osmfoundation.org/policies/tiles/)
+leaflet_raster_tile_roadmap="OpenStreetMap" ;; Examples: "OpenStreetMap.DE", "Stamen.TonerLite", "CartoDB.Voyager", "HERE.normalDay" or "HERE.reducedDay"
+leaflet_raster_tile_terrain="OpenTopoMap"   ;; Examples: "OpenTopoMap", "Stamen.Terrain" or "HERE.terrainDay"
+leaflet_raster_tile_satellite=""            ;; Examples: "HERE.satelliteDay"
+
+;; Coverage settings, by default we include stationary senders and only include the 95% percent of the closest positions
+coverage_only_moving_senders="0"
+coverage_percentile="95"
+
 
 [database]
 
diff --git a/htdocs/public/index.php b/htdocs/public/index.php
index 22afe36d7991ddb0f561fa39cf0bc1f67fe7e164..c26188b6f17f8bb2ae6eb49fe32539f8683be695 100755
--- a/htdocs/public/index.php
+++ b/htdocs/public/index.php
@@ -76,6 +76,7 @@ $REQUEST_PROTOCOL = $isSecure ? 'https' : 'http';
                 options['isMobile'] = false;
                 options['useImperialUnit'] = <?php echo (isImperialUnitUser() ? 'true': 'false'); ?>;
                 options['coverageDataUrl'] = '/data/coverage.php';
+                options['coveragePercentile'] = <?php echo (getWebsiteConfig('coverage_percentile') ?? "95"); ?>;
                 options['defaultTimeLength'] = 60; // In minutes
 
                 var md = new MobileDetect(window.navigator.userAgent);
@@ -136,27 +137,9 @@ $REQUEST_PROTOCOL = $isSecure ? 'https' : 'http';
                         L.TileLayer.Provider.providers['HERE'].options['app_code'] = '<?php echo getWebsiteConfig('here_app_code'); ?>';
 
                         options['supportedMapTypes'] = {};
-
-
-                        <?php if (getWebsiteConfig('here_app_code') != null) : ?>
-                            options['supportedMapTypes']['roadmap'] = 'HERE.reducedDay';
-                        <?php else : ?>
-                            options['supportedMapTypes']['roadmap'] = 'OpenStreetMap';
-                        <?php endif; ?>
-                        //options['supportedMapTypes']['roadmap'] = 'OpenStreetMap.DE';
-                        //options['supportedMapTypes']['roadmap'] = 'Stamen.TonerLite';
-                        //options['supportedMapTypes']['roadmap'] = 'CartoDB.Voyager';
-                        //options['supportedMapTypes']['roadmap'] = 'HERE.normalDay';
-
-                        <?php if (getWebsiteConfig('here_app_code') != null) : ?>
-                            options['supportedMapTypes']['terrain'] = 'HERE.terrainDay';
-                        <?php else : ?>
-                            options['supportedMapTypes']['terrain'] = 'OpenTopoMap';
-                        <?php endif; ?>
-                        //options['supportedMapTypes']['terrain'] = 'Stamen.Terrain';
-
-                        options['supportedMapTypes']['satellite'] = 'HERE.satelliteDay';
-
+                        options['supportedMapTypes']['roadmap'] = "<?php echo getWebsiteConfig('leaflet_raster_tile_roadmap'); ?>";
+                        options['supportedMapTypes']['terrain'] = "<?php echo getWebsiteConfig('leaflet_raster_tile_terrain'); ?>";
+                        options['supportedMapTypes']['satellite'] = "<?php echo getWebsiteConfig('leaflet_raster_tile_satellite'); ?>";
                     <?php endif; ?>
 
                     // host is used to create url to /heatmaps and /images
@@ -244,7 +227,7 @@ $REQUEST_PROTOCOL = $isSecure ? 'https' : 'http';
                 <div class="dropdown-content" id="tdTopnavMapType">
                     <a href="javascript:void(0);" onclick="trackdirect.setMapType('roadmap'); $('#tdTopnavMapType>a').removeClass('dropdown-content-checkbox-active'); $(this).addClass('dropdown-content-checkbox-active');" class="dropdown-content-checkbox dropdown-content-checkbox-active">Roadmap</a>
                     <a href="javascript:void(0);" onclick="trackdirect.setMapType('terrain'); $('#tdTopnavMapType>a').removeClass('dropdown-content-checkbox-active'); $(this).addClass('dropdown-content-checkbox-active');" class="dropdown-content-checkbox">Terrain/Outdoors</a>
-                    <?php if ($mapapi == 'google' || getWebsiteConfig('here_app_code') != null) : ?>
+                    <?php if ($mapapi == 'google' || getWebsiteConfig('leaflet_raster_tile_satellite') != null) : ?>
                     <a href="javascript:void(0);" onclick="trackdirect.setMapType('satellite'); $('#tdTopnavMapType>a').removeClass('dropdown-content-checkbox-active'); $(this).addClass('dropdown-content-checkbox-active');" class="dropdown-content-checkbox">Satellite</a>
                     <?php endif; ?>
                 </div>