diff --git a/app/services/osm.js b/app/services/osm.js
index 8cff92a..6799ae3 100644
--- a/app/services/osm.js
+++ b/app/services/osm.js
@@ -25,7 +25,6 @@ export default class OsmService extends Service {
     const signal = this.controller.signal;
 
     const typeKeys = [
-      'amenity',
       'amenity',
       'shop',
       'tourism',
@@ -36,6 +35,7 @@ export default class OsmService extends Service {
       'building',
       'landuse',
       'public_transport',
+      'highway',
       'aeroway',
     ];
     const typeKeysQuery = [`~"^(${typeKeys.join('|')})$"~".*"`];
diff --git a/app/utils/osm.js b/app/utils/osm.js
index 4f6e810..d28168d 100644
--- a/app/utils/osm.js
+++ b/app/utils/osm.js
@@ -40,8 +40,8 @@ export function getPlaceType(tags) {
     tags.amenity ||
     tags.shop ||
     tags.tourism ||
-    tags.leisure ||
     tags.historic ||
+    tags.leisure ||
     tags.office ||
     tags.craft ||
     tags.building ||
@@ -49,6 +49,7 @@ export function getPlaceType(tags) {
     tags.place ||
     tags.natural ||
     tags.public_transport ||
+    tags.highway ||
     tags.aeroway ||
     tags.waterway ||
     tags.border_type ||