diff --git a/src/GUI/MapWidget.cxx b/src/GUI/MapWidget.cxx
index b063bc7..dc40614 100644
--- a/src/GUI/MapWidget.cxx
+++ b/src/GUI/MapWidget.cxx
@@ -937,6 +937,11 @@ private:

 void MapWidget::drawAirports()
 {
+
+  if (_cachedZoom >= SHOW_DETAIL_ZOOM+2) {
+    return;
+  }
+
   MapAirportFilter af(_root);
   bool partial = false;
   FGPositionedList apts = FGPositioned::findWithinRangePartial(_projectionCenter, _drawRangeNm, &af, partial);
@@ -978,6 +983,11 @@ private:

 void MapWidget::drawNavaids()
 {
+
+  if (_cachedZoom >= SHOW_DETAIL_ZOOM+2) {
+    return;
+  }
+
   bool fixes = _root->getBoolValue("draw-fixes");
   NavaidFilter f(fixes, _root->getBoolValue("draw-navaids"));

@@ -1001,8 +1011,12 @@ void MapWidget::drawNavaids()
 void MapWidget::drawPOIs()
 {
   FGPositioned::TypeFilter f(FGPositioned::COUNTRY);
-  f.addType(FGPositioned::CITY);
-  f.addType(FGPositioned::TOWN);
+  if (_cachedZoom < SHOW_DETAIL2_ZOOM) {
+    f.addType(FGPositioned::CITY);
+  }
+  if (_cachedZoom < SHOW_DETAIL_ZOOM) {
+    f.addType(FGPositioned::TOWN);
+  }
   FGPositionedList poi = FGPositioned::findWithinRange(_projectionCenter, _drawRangeNm, &f);

     glLineWidth(1.0);