diff --git a/data/editor.xml b/data/editor.xml
index 99feeecdec..86cae15524 100644
--- a/data/editor.xml
+++ b/data/editor.xml
@@ -1,6 +1,7 @@
 <mapsme>
   <editor>
     <disable everywhere="no">
+      <!--bbox minlon="37.6120" minlat="55.7479" maxlon="37.6239" maxlat="55.7553" editable="no" /-->
     </disable>
 
     <fields>
@@ -26,6 +27,8 @@
       <!-- Metadata::FMD fields in order. -->
       <field name="cuisine">
         <tag k="cuisine" />
+        <!-- A list of values is hard-coded, so string in this case. -->
+        <value type="string" many="yes" />
       </field>
       <field name="opening_hours">
         <tag k="opening_hours" />
@@ -33,7 +36,7 @@
       <field name="phone">
         <tag k="phone" />
         <alt k="contact:phone" />
-        <value type="list" />
+        <value type="string" many="yes" />
       </field>
       <field name="fax" editable="no">
         <tag k="fax" />
@@ -49,12 +52,17 @@
       <!-- What is FMD_URL? -->
       <field name="website">
         <tag k="website" />
+        <alt k="url" />
         <alt k="contact:website" />
       </field>
       <field name="internet">
         <tag k="internet_access" />
-        <value type="boolean" />
-        <!-- TODO: no/wlan? -->
+        <value type="list">
+          <option value="no" />
+          <option value="wired" />
+          <option value="wlan" />
+          <option value="yes" />
+        </value>
       </field>
       <field name="ele">
         <tag k="ele" />
@@ -93,10 +101,18 @@
         <field_ref name="housenumber" />
         <field_ref name="postcode" />
       </field_group>
-      <field_group name="poi">
+      <field_group name="poi_noname">
+        <field_ref name="street" />
+        <field_ref name="housenumber" />
+        <field_ref name="opening_hours" />
+        <field_ref name="phone" />
+        <field_ref name="email" />
+        <field_ref name="website" />
+      </field_group>
+      <field_group name="poi">
+        <field_ref name="name" />
         <field_ref name="street" />
         <field_ref name="housenumber" />
-        <field_ref name="postcode" />
         <field_ref name="opening_hours" />
         <field_ref name="phone" />
         <field_ref name="email" />
@@ -105,23 +121,20 @@
     </fields>
 
     <types>
-      <type id="aeroway-aerodrome" can_add="no">
+      <type id="aeroway-aerodrome" editable="no">
         <tag k="aeroway" v="aerodrome" />
-        <include field="name" />
         <include group="poi" />
         <include field="ele" />
         <include field="operator" />
       </type>
-      <type id="aeroway-airport" can_add="no">
+      <type id="aeroway-airport" editable="no">
         <tag k="aeroway" v="airport" />
-        <include field="name" />
         <include group="poi" />
         <include field="ele" />
         <include field="operator" />
       </type>
       <type id="amenity-atm">
         <tag k="amenity" v="atm" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="website" />
@@ -129,39 +142,33 @@
       </type>
       <type id="amenity-bank">
         <tag k="amenity" v="bank" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="amenity-bar">
         <tag k="amenity" v="bar" />
-        <include field="name" />
         <include group="poi" />
         <include field="cuisine" />
         <include field="internet" />
       </type>
       <type id="amenity-bicycle_rental">
         <tag k="amenity" v="bicycle_rental" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="amenity-bureau_de_change">
         <tag k="amenity" v="bureau_de_change" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="amenity-bus_station">
         <tag k="amenity" v="bus_station" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="amenity-cafe">
         <tag k="amenity" v="cafe" />
-        <include field="name" />
         <include group="poi" />
         <include field="cuisine" />
         <include field="operator" />
@@ -169,70 +176,59 @@
       </type>
       <type id="amenity-car_rental">
         <tag k="amenity" v="car_rental" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="amenity-car_sharing">
         <tag k="amenity" v="car_sharing" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="website" />
       </type>
       <type id="amenity-casino">
         <tag k="amenity" v="casino" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="amenity-cinema">
         <tag k="amenity" v="cinema" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="amenity-clinic">
         <tag k="amenity" v="clinic" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="amenity-college" can_add="no">
         <tag k="amenity" v="college" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="amenity-doctors">
         <tag k="amenity" v="doctors" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="amenity-dentist">
         <tag k="amenity" v="dentist" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="amenity-drinking_water">
         <tag k="amenity" v="drinking_water" />
         <include field="name" />
-        <include group="poi" />
       </type>
       <type id="amenity-embassy">
         <tag k="amenity" v="embassy" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="amenity-fast_food">
         <tag k="amenity" v="fast_food" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="cuisine" />
@@ -240,66 +236,55 @@
       </type>
       <type id="amenity-ferry_terminal" can_add="no">
         <tag k="amenity" v="ferry_terminal" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="amenity-fire_station">
         <tag k="amenity" v="fire_station" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="amenity-fountain">
         <tag k="amenity" v="fountain" />
         <include field="name" />
-        <include group="poi" />
       </type>
       <type id="amenity-fuel">
         <tag k="amenity" v="fuel" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="amenity-grave_yard" can_add="no">
         <tag k="amenity" v="grave_yard" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="amenity-hospital" can_add="no">
         <tag k="amenity" v="hospital" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="amenity-hunting_stand">
         <tag k="amenity" v="hunting_stand" />
         <include field="name" />
-        <include group="poi" />
         <include field="height" />
       </type>
       <type id="amenity-kindergarten" can_add="no">
         <tag k="amenity" v="kindergarten" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="amenity-library">
         <tag k="amenity" v="library" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="amenity-marketplace" can_add="no">
         <tag k="amenity" v="marketplace" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="amenity-nightclub">
         <tag k="amenity" v="nightclub" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
@@ -307,35 +292,29 @@
       <type id="amenity-parking" can_add="no">
         <tag k="amenity" v="parking" />
         <include field="name" />
-        <include group="poi" />
         <include field="operator" />
       </type>
       <type id="amenity-pharmacy">
         <tag k="amenity" v="pharmacy" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="amenity-place_of_worship">
         <tag k="amenity" v="place_of_worship" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="amenity-police">
         <tag k="amenity" v="police" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="amenity-post_box">
         <tag k="amenity" v="post_box" />
         <include field="name" />
-        <include group="poi" />
         <include field="operator" />
         <include field="postcode" />
       </type>
       <type id="amenity-post_office">
         <tag k="amenity" v="post_office" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="postcode" />
@@ -343,7 +322,6 @@
       </type>
       <type id="amenity-pub">
         <tag k="amenity" v="pub" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="cuisine" />
@@ -352,14 +330,12 @@
       <type id="amenity-recycling">
         <tag k="amenity" v="recycling" />
         <include field="name" />
-        <include group="poi" />
         <include field="operator" />
         <include field="website" />
         <include field="phone" />
       </type>
       <type id="amenity-restaurant">
         <tag k="amenity" v="restaurant" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="cuisine" />
@@ -367,493 +343,408 @@
       </type>
       <type id="amenity-school" can_add="no">
         <tag k="amenity" v="school" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="amenity-taxi" can_add="no">
         <tag k="amenity" v="taxi" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="amenity-telephone">
         <tag k="amenity" v="telephone" />
-        <include field="name" />
-        <include group="poi" />
         <include field="operator" />
         <include field="phone" />
       </type>
       <type id="amenity-theatre">
         <tag k="amenity" v="theatre" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="amenity-toilets">
         <tag k="amenity" v="toilets" />
-        <include field="name" />
-        <include group="poi" />
         <include field="operator" />
         <include field="opening_hours" />
       </type>
       <type id="amenity-townhall" can_add="no">
         <tag k="amenity" v="townhall" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="amenity-university" can_add="no">
         <tag k="amenity" v="university" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="amenity-waste_disposal">
         <tag k="amenity" v="waste_disposal" />
-        <include field="name" />
-        <include group="poi" />
         <include field="operator" />
       </type>
       <type id="craft" can_add="no">
-        <tag t="craft" />
-        <include field="name" />
+        <tag k="craft" />
         <include group="poi" />
       </type>
       <type id="craft-brewery">
         <tag k="craft" v="brewery" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="craft-carpenter">
         <tag k="craft" v="carpenter" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="craft-electrician">
         <tag k="craft" v="electrician" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="craft-gardener">
         <tag k="craft" v="gardener" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="craft-hvac">
         <tag k="craft" v="hvac" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="craft-metal_construction">
         <tag k="craft" v="metal_construction" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="craft-painter">
         <tag k="craft" v="painter" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="craft-photographer">
         <tag k="craft" v="photographer" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="craft-plumber">
         <tag k="craft" v="plumber" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="craft-shoemaker">
         <tag k="craft" v="shoemaker" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="craft-tailor">
         <tag k="craft" v="tailor" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="highway-bus_stop">
         <tag k="highway" v="bus_stop" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="historic-archaeological_site" can_add="no">
         <tag k="historic" v="archaeological_site" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
       </type>
       <type id="historic-castle" can_add="no">
         <tag k="historic" v="castle" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
       </type>
       <type id="historic-memorial">
         <tag k="historic" v="memorial" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
       </type>
       <type id="historic-monument">
         <tag k="historic" v="monument" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
       </type>
       <type id="historic-ruins" can_add="no">
         <tag k="historic" v="ruins" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
       </type>
       <type id="landuse-cemetery" can_add="no">
         <tag k="landuse" v="cemetery" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
       </type>
       <type id="leisure-garden" can_add="no">
         <tag k="leisure" v="garden" />
-        <include field="name" />
         <include group="poi" />
         <include field="opening_hours" />
         <include field="internet" />
       </type>
       <type id="leisure-sports_centre" can_add="no">
         <tag k="leisure" v="sports_centre" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="leisure-stadium" can_add="no">
         <tag k="leisure" v="stadium" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
         <include field="operator" />
       </type>
       <type id="leisure-swimming_pool" can_add="no">
         <tag k="leisure" v="swimming_pool" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="natural-peak" can_add="no">
         <tag k="natural" v="peak" />
         <include field="name" />
-        <include group="poi" />
         <include field="wikipedia" />
         <include field="ele" />
       </type>
       <type id="natural-spring">
         <tag k="natural" v="spring" />
         <include field="name" />
-        <include group="poi" />
-        <include field="wikipedia" />
       </type>
       <type id="natural-waterfall" can_add="no">
         <tag k="natural" v="waterfall" />
         <include field="name" />
-        <include group="poi" />
+        <include field="height" />
         <include field="wikipedia" />
       </type>
       <type id="office" can_add="no">
-        <tag t="office" />
-        <include field="name" />
+        <tag k="office" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="office-company">
         <tag k="office" v="company" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="office-government">
         <tag k="office" v="government" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="office-lawyer">
         <tag k="office" v="lawyer" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="office-telecommunication">
         <tag k="office" v="telecommunication" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
         <include field="operator" />
       </type>
       <type id="place-farm" can_add="no">
         <tag k="place" v="farm" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
       </type>
       <type id="place-hamlet" can_add="no">
         <tag k="place" v="hamlet" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
       </type>
       <type id="place-village" can_add="no">
         <tag k="place" v="village" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
       </type>
       <type id="railway-halt" editable="no" can_add="no">
         <tag k="railway" v="halt" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="railway-station" editable="no" can_add="no">
         <tag k="railway" v="station" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="railway-subway_entrance" editable="no" can_add="no">
         <tag k="railway" v="subway_entrance" />
         <include field="name" />
-        <include group="poi" />
+        <include field="operator" />
       </type>
       <type id="railway-tram_stop" editable="no">
         <tag k="railway" v="tram_stop" />
         <include field="name" />
-        <include group="poi" />
         <include field="operator" />
       </type>
       <type id="shop" can_add="no">
-        <tag t="shop" />
-        <include field="name" />
+        <tag k="shop" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-alcohol">
         <tag k="shop" v="alcohol" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-bakery">
         <tag k="shop" v="bakery" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-beauty">
         <tag k="shop" v="beauty" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-beverages">
         <tag k="shop" v="beverages" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-bicycle">
         <tag k="shop" v="bicycle" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-books">
         <tag k="shop" v="books" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-butcher">
         <tag k="shop" v="butcher" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-car">
         <tag k="shop" v="car" />
-        <include field="name" />
-        <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-car_repair">
         <tag k="shop" v="car_repair" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-chemist">
         <tag k="shop" v="chemist" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-clothes">
         <tag k="shop" v="clothes" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-computer">
         <tag k="shop" v="computer" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-confectionery">
         <tag k="shop" v="confectionery" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-convenience">
         <tag k="shop" v="convenience" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-department_store">
         <tag k="shop" v="department_store" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-doityourself">
         <tag k="shop" v="doityourself" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-electronics">
         <tag k="shop" v="electronics" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-florist">
         <tag k="shop" v="florist" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-furniture">
         <tag k="shop" v="furniture" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-garden_centre">
         <tag k="shop" v="garden_centre" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-gift">
         <tag k="shop" v="gift" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-greengrocer">
         <tag k="shop" v="greengrocer" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-hairdresser">
         <tag k="shop" v="hairdresser" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-hardware">
         <tag k="shop" v="hardware" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-jewelry">
         <tag k="shop" v="jewelry" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-kiosk">
         <tag k="shop" v="kiosk" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-laundry">
         <tag k="shop" v="laundry" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-mall">
         <tag k="shop" v="mall" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-mobile_phone">
         <tag k="shop" v="mobile_phone" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-optician">
         <tag k="shop" v="optician" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-shoes">
         <tag k="shop" v="shoes" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-sports">
         <tag k="shop" v="sports" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="shop-supermarket">
         <tag k="shop" v="supermarket" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="shop-toys">
         <tag k="shop" v="toys" />
-        <include field="name" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="tourism-alpine_hut">
         <tag k="tourism" v="alpine_hut" />
-        <include field="name" />
         <include group="poi" />
         <include field="ele" />
         <include field="opening_hours" />
@@ -864,19 +755,15 @@
       <type id="tourism-artwork">
         <tag k="tourism" v="artwork" />
         <include field="name" />
-        <include group="poi" />
-        <include field="wikipedia" />
       </type>
       <type id="tourism-attraction">
         <tag k="tourism" v="attraction" />
-        <include field="name" />
         <include group="poi" />
         <include field="wikipedia" />
         <include field="website" />
       </type>
       <type id="tourism-camp_site">
         <tag k="tourism" v="camp_site" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="website" />
@@ -885,7 +772,6 @@
       </type>
       <type id="tourism-caravan_site">
         <tag k="tourism" v="caravan_site" />
-        <include field="name" />
         <include group="poi" />
         <include field="website" />
         <include field="operator" />
@@ -893,40 +779,34 @@
       </type>
       <type id="tourism-guest_house">
         <tag k="tourism" v="guest_house" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="tourism-hostel">
         <tag k="tourism" v="hostel" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="tourism-hotel">
         <tag k="tourism" v="hotel" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="tourism-information">
         <tag k="tourism" v="information" />
-        <include field="name" />
         <include group="poi" />
       </type>
       <type id="tourism-motel">
         <tag k="tourism" v="motel" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
       </type>
       <type id="tourism-museum">
         <tag k="tourism" v="museum" />
-        <include field="name" />
         <include group="poi" />
         <include field="operator" />
         <include field="internet" />
@@ -934,13 +814,12 @@
       <type id="tourism-viewpoint">
         <tag k="tourism" v="viewpoint" />
         <include field="name" />
-        <include group="poi" />
       </type>
       <type id="waterway-waterfall" can_add="no">
         <tag k="waterway" v="waterfall" />
         <include field="name" />
-        <include group="poi" />
         <include field="height" />
+        <include field="wikipedia" />
       </type>
     </types>