diff --git a/data/editor.config b/data/editor.config
index e37d37a7fa..77633aed06 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -604,6 +604,9 @@
       <type id="historic-wayside_cross" group="historic">
         <include field="name" />
       </type>
+      <type id="man_made-cross">
+        <include field="name" />
+      </type>
       <type id="historic-wayside_shrine" group="historic">
         <include field="name" />
       </type>
@@ -1182,6 +1185,12 @@
       <type id="emergency-phone">
         <include field="phone" />
       </type>
+      <type id="emergency-mountain_rescue">
+        <include group="poi_internet" />
+      </type>
+      <type id="emergency-lifeguard">
+        <include field="name" />
+      </type>
       <type id="highway-rest_area">
         <include field="name" />
         <include field="internet" />
@@ -1216,16 +1225,34 @@
         <include field="operator" />
         <include field="height" />
       </type>
+      <type id="man_made-flare">
+        <include field="name" />
+        <include field="operator" />
+        <include field="height" />
+      </type>
+      <type id="man_made-petroleum_well">
+        <include field="name" />
+        <include field="operator" />
+      </type>
       <type id="man_made-water_well">
         <include field="name" />
         <include field="operator" />
       </type>
-      <!-- Uncomment after a map style is added
+      <type id="man_made-tower">
+        <include field="name" />
+        <include field="operator" />
+        <include field="height" />
+      </type>
       <type id="man_made-water_tower">
         <include field="name" />
         <include field="operator" />
         <include field="height" />
-      </type>-->
+      </type>
+      <type id="man_made-communications_tower">
+        <include field="name" />
+        <include field="operator" />
+        <include field="height" />
+      </type>
       <type id="man_made-cairn">
         <include field="name" />
       </type>