diff --git a/app/utils/osm.js b/app/utils/osm.js
index 73ec343..6257031 100644
--- a/app/utils/osm.js
+++ b/app/utils/osm.js
@@ -41,11 +41,11 @@ const PLACE_TYPE_KEYS = [
   'historic',
   'leisure',
   'office',
+  'aeroway',
   'building',
   'landuse',
   'public_transport',
   'highway',
-  'aeroway',
   'waterway',
   'natural',
   'place',
diff --git a/app/utils/poi-categories.js b/app/utils/poi-categories.js
index fe1cf92..68c6b4f 100644
--- a/app/utils/poi-categories.js
+++ b/app/utils/poi-categories.js
@@ -45,7 +45,7 @@ export const POI_CATEGORIES = [
     filter: [
       '["tourism"~"^(museum|gallery|attraction|viewpoint|zoo|theme_park|aquarium|artwork|information)$"]',
       '["amenity"~"^(cinema|theatre|arts_centre|planetarium)$"]',
-      '["leisure"~"^(sports_centre|stadium|water_park)$"]',
+      '["leisure"~"^(sports_centre|stadium|water_park|golf_course|marina)$"]',
       '["historic"]',
       '["shop"="flea_market"]',
     ],