diff --git a/data/presets.yaml b/data/presets.yaml
index 1400a6737..7cf9cab58 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1145,6 +1145,9 @@ en:
       ref:
         # ref=*
         label: Reference Code
+      ref/isil:
+        # 'ref:isil=*'
+        label: ISIL Code
       ref_aeroway_gate:
         # ref=*
         label: Gate Number
@@ -3410,8 +3413,8 @@ en:
         terms: '<translate with synonyms or related terms for ''Forest'', separated by commas>'
       landuse/garages:
         # landuse=garages
-        name: Garages
-        terms: '<translate with synonyms or related terms for ''Garages'', separated by commas>'
+        name: Garage Landuse
+        terms: '<translate with synonyms or related terms for ''Garage Landuse'', separated by commas>'
       landuse/grass:
         # landuse=grass
         name: Grass
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 90b49d4cc..25c2fa544 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1571,6 +1571,11 @@
             "type": "text",
             "label": "Reference Code"
         },
+        "ref/isil": {
+            "key": "ref:isil",
+            "type": "text",
+            "label": "ISIL Code"
+        },
         "relation": {
             "key": "type",
             "type": "combo",
diff --git a/data/presets/fields/ref/isil.json b/data/presets/fields/ref/isil.json
new file mode 100644
index 000000000..fcf0a0ffe
--- /dev/null
+++ b/data/presets/fields/ref/isil.json
@@ -0,0 +1,5 @@
+{
+    "key": "ref:isil",
+    "type": "text",
+    "label": "ISIL Code"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 415a51dd6..49f2a2c55 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1882,7 +1882,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "geometry": [
                 "point",
@@ -8413,7 +8414,7 @@
                 "landuse": "garages"
             },
             "terms": [],
-            "name": "Garages"
+            "name": "Garage Landuse"
         },
         "landuse/grass": {
             "geometry": [
@@ -18512,6 +18513,8 @@
         "tourism/information/guidepost": {
             "icon": "information",
             "fields": [
+                "name",
+                "elevation",
                 "operator",
                 "ref"
             ],
@@ -44430,7 +44433,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44453,7 +44457,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44476,7 +44481,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44499,7 +44505,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44522,7 +44529,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44545,7 +44553,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44568,7 +44577,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44591,7 +44601,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44614,7 +44625,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44637,7 +44649,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44660,7 +44673,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44683,7 +44697,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44706,7 +44721,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44729,7 +44745,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44752,7 +44769,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44775,7 +44793,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44798,7 +44817,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44821,7 +44841,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44844,7 +44865,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44867,7 +44889,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44890,7 +44913,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44913,7 +44937,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
@@ -44936,7 +44961,8 @@
                 "opening_hours",
                 "internet_access",
                 "internet_access/fee",
-                "internet_access/ssid"
+                "internet_access/ssid",
+                "ref/isil"
             ],
             "suggestion": true
         },
diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
index 0f3a48c77..f6fc301cd 100644
--- a/data/presets/presets/amenity/library.json
+++ b/data/presets/presets/amenity/library.json
@@ -8,7 +8,8 @@
         "opening_hours",
         "internet_access",
         "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "ref/isil"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/landuse/garages.json b/data/presets/presets/landuse/garages.json
index ba5f253ab..72575fdd9 100644
--- a/data/presets/presets/landuse/garages.json
+++ b/data/presets/presets/landuse/garages.json
@@ -9,5 +9,5 @@
         "landuse": "garages"
     },
     "terms": [],
-    "name": "Garages"
+    "name": "Garage Landuse"
 }
diff --git a/data/presets/presets/tourism/information/guidepost.json b/data/presets/presets/tourism/information/guidepost.json
index 2fe4f0ede..f9e0ee043 100644
--- a/data/presets/presets/tourism/information/guidepost.json
+++ b/data/presets/presets/tourism/information/guidepost.json
@@ -1,6 +1,8 @@
 {
     "icon": "information",
     "fields": [
+        "name",
+        "elevation",
         "operator",
         "ref"
     ],
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a81b5609b..ae008afc4 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2249,6 +2249,9 @@
                 "ref": {
                     "label": "Reference Code"
                 },
+                "ref/isil": {
+                    "label": "ISIL Code"
+                },
                 "relation": {
                     "label": "Type"
                 },
@@ -4254,7 +4257,7 @@
                     "terms": "tree"
                 },
                 "landuse/garages": {
-                    "name": "Garages",
+                    "name": "Garage Landuse",
                     "terms": ""
                 },
                 "landuse/grass": {
diff --git a/modules/modes/select.js b/modules/modes/select.js
index 1c87a96ed..ba9af0b95 100644
--- a/modules/modes/select.js
+++ b/modules/modes/select.js
@@ -248,13 +248,13 @@ export function modeSelect(context, selectedIDs) {
             var target = d3_select(d3_event.target);
 
             var datum = target.datum();
-            var entity = datum && datum.id && context.hasEntity(datum.id);
-            if (entity) datum = entity;
+            var entity = datum && datum.properties && datum.properties.entity;
+            if (!entity) return;
 
-            if (datum instanceof osmWay && target.classed('target')) {
-                var choice = geoChooseEdge(context.childNodes(datum), context.mouse(), context.projection);
-                var prev = datum.nodes[choice.index - 1];
-                var next = datum.nodes[choice.index];
+            if (entity instanceof osmWay && target.classed('target')) {
+                var choice = geoChooseEdge(context.childNodes(entity), context.mouse(), context.projection);
+                var prev = entity.nodes[choice.index - 1];
+                var next = entity.nodes[choice.index];
 
                 context.perform(
                     actionAddMidpoint({loc: choice.loc, edge: [prev, next]}, osmNode()),
@@ -264,9 +264,9 @@ export function modeSelect(context, selectedIDs) {
                 d3_event.preventDefault();
                 d3_event.stopPropagation();
 
-            } else if (datum.type === 'midpoint') {
+            } else if (entity.type === 'midpoint') {
                 context.perform(
-                    actionAddMidpoint({loc: datum.loc, edge: datum.edge}, osmNode()),
+                    actionAddMidpoint({loc: entity.loc, edge: entity.edge}, osmNode()),
                     t('operations.add.annotation.vertex'));
 
                 d3_event.preventDefault();