diff --git a/data/editor.config b/data/editor.config
index 210ba5a081..3325b771c8 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -153,6 +153,21 @@
         <field_ref name="contact_twitter" />
         <field_ref name="contact_vk" />
       </field_group>
+      <field_group name="poi_internet">
+        <field_ref name="name" />
+        <field_ref name="street" />
+        <field_ref name="housenumber" />
+        <field_ref name="level" />
+        <field_ref name="opening_hours" />
+        <field_ref name="internet" />
+        <field_ref name="phone" />
+        <field_ref name="email" />
+        <field_ref name="website" />
+        <field_ref name="contact_facebook" />
+        <field_ref name="contact_instagram" />
+        <field_ref name="contact_twitter" />
+        <field_ref name="contact_vk" />
+      </field_group>
     </fields>
     <!-- Types should be sorted by their priority. -->
     <!-- Buildings are hardcoded in editor_config.cpp and are mixed with any other type. -->
@@ -170,15 +185,13 @@
         <include field="operator" />
       </type>
       <type id="amenity-bank" group="banking">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
         <!-- Uncomment this and other atm fields when the code supports it. -->
         <!--include field="atm" /-->
       </type>
       <type id="amenity-bar" group="food">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="cuisine" />
-        <include field="internet" />
       </type>
       <type id="amenity-bicycle_rental">
         <include field="website" />
@@ -189,23 +202,20 @@
         <include field="opening_hours" />
       </type>
       <type id="amenity-bureau_de_change" group="banking">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="operator" />
         <!--include field="atm" /-->
       </type>
       <type id="amenity-bus_station">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-cafe" group="food">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="cuisine" />
-        <include field="internet" />
       </type>
       <type id="amenity-car_rental">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="operator" />
-        <include field="internet" />
       </type>
       <type id="amenity-car_sharing" can_add="no">
         <include group="poi" />
@@ -213,72 +223,62 @@
         <include field="website" />
       </type>
       <type id="amenity-casino">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-cinema">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-clinic" group="health">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-college" group="education">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-doctors" group="health">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-dentist" group="health">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-drinking_water">
         <include field="name" />
         <include field="operator" />
       </type>
       <type id="office-diplomatic">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-fast_food" group="food">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="cuisine" />
-        <include field="internet" />
       </type>
       <type id="amenity-ferry_terminal" can_add="no">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-fire_station">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-fountain">
         <include field="name" />
       </type>
       <type id="amenity-fuel">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="operator" />
-        <include field="internet" />
       </type>
       <type id="amenity-grave_yard" can_add="no">
         <include group="poi" />
       </type>
       <type id="amenity-hospital" group="health">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-hunting_stand">
         <include field="name" />
         <include field="height" />
       </type>
       <type id="amenity-kindergarten" group="education">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-library">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-public_bookcase">
         <include field="name" />
@@ -289,8 +289,7 @@
         <include group="poi" />
       </type>
       <type id="amenity-nightclub">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-parcel_locker">
         <include field="operator" />
@@ -302,28 +301,26 @@
         <include field="opening_hours" />
       </type>
       <type id="amenity-pharmacy" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-place_of_worship">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-police">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-post_box">
         <include field="name" />
         <include field="postcode" />
       </type>
       <type id="amenity-post_office">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="operator" />
         <include field="postcode" />
-        <include field="internet" />
       </type>
       <type id="amenity-pub" group="food">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="cuisine" />
-        <include field="internet" />
       </type>
       <type id="amenity-recycling-centre">
         <include group="poi" />
@@ -333,12 +330,11 @@
         <include field="operator" />
       </type>
       <type id="amenity-restaurant" group="food">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="cuisine" />
-        <include field="internet" />
       </type>
       <type id="amenity-school" group="education">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-taxi" can_add="no">
         <include group="poi" />
@@ -347,17 +343,16 @@
         <include field="phone" />
       </type>
       <type id="amenity-theatre">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-toilets">
         <include field="opening_hours" />
       </type>
       <type id="amenity-townhall">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-university" group="education" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-waste_disposal">
         <include field="operator" />
@@ -368,86 +363,81 @@
         <include field="operator" />
       </type>
       <type id="amenity-car_wash">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-childcare">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-veterinary" group="health">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-charging_station">
         <include group="poi" />
         <include field="operator" />
       </type>
       <type id="craft" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-beekeeper">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-blacksmith">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-brewery" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-carpenter">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <!-- Not addable because ambigous with shop=confectionery -->
       <type id="craft-confectionery" group="shop" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-electrician">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-electronics_repair">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-gardener" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-handicraft">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-hvac" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-metal_construction" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-painter" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-photographer">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-plumber">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-sawmill" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-shoemaker">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-tailor">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="craft-winery" group="shop" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="healthcare-laboratory" group="health">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="healthcare-physiotherapist" group="health">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="highway-bus_stop">
         <include field="name" />
@@ -477,20 +467,18 @@
         <include field="wikipedia" />
       </type>
       <type id="leisure-garden" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="opening_hours" />
-        <include field="internet" />
       </type>
       <type id="leisure-sports_centre" can_add="no">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="leisure-stadium" can_add="no">
         <include group="poi" />
         <include field="wikipedia" />
       </type>
       <type id="leisure-swimming_pool" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="natural-geyser">
         <include field="name" />
@@ -512,33 +500,31 @@
         <include field="wikipedia" />
       </type>
       <type id="office" can_add="no">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="office-company" group="office">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="office-estate_agent" group="office">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="office-government" group="office">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="office-insurance" group="office">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="office-lawyer" group="office">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="office-ngo" group="office">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="office-telecommunication" group="office">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="place-farm" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="wikipedia" />
       </type>
       <type id="place-hamlet" can_add="no">
@@ -553,7 +539,7 @@
         <include field="name" />
       </type>
       <type id="railway-station" editable="no" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="railway-subway_entrance" editable="no" can_add="no">
         <include field="name" />
@@ -563,326 +549,251 @@
         <include field="name" />
       </type>
       <type id="shop" can_add="no">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-alcohol" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-antiques" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-art" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-charity" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-baby_goods" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-bag" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-bakery" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-beauty">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-beverages" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-bicycle" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-books" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-butcher" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-car" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-caravan" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-car_repair">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-cheese" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-chemist" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-chocolate" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-clothes" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-coffee" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-computer" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-video_games" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-confectionery" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-convenience" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-copyshop" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-dairy" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-deli" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-department_store" group="big_shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-doityourself" group="shop" can_add="no">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-dry_cleaning">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-electrical" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-electronics" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-farm" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-fishing" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-florist" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-furniture" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-garden_centre" group="big_shop" can_add="no">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-gift" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-greengrocer" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-grocery" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-hairdresser">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-hardware" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-health_food" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-houseware" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-interior_decoration" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-jewelry" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-kiosk" group="shop" can_add="no">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-kitchen" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-laundry" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-mall" group="big_shop" can_add="no">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-mobile_phone" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-nutrition_supplements" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-optician" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-outdoor" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-perfumery" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-second_hand" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-sewing" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-shoes" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-sports" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-supermarket" group="big_shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-tobacco" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-toys" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-photo" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-travel_agency" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-tyres" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-watches" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-alpine_hut" group="accomodation">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="ele" />
         <include field="opening_hours" />
         <include field="website" />
-        <include field="internet" />
       </type>
       <type id="tourism-apartment" group="accomodation">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-artwork">
         <include field="name" />
       </type>
       <type id="tourism-attraction">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="wikipedia" />
       </type>
       <type id="tourism-camp_site" group="accomodation">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-caravan_site" group="accomodation">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-chalet" group="accomodation">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-gallery">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-guest_house" group="accomodation">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-hostel" group="accomodation">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-hotel" group="accomodation">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-information">
         <include group="poi" />
       </type>
       <type id="tourism-motel" group="accomodation">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-museum">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-viewpoint">
         <include field="name" />
@@ -894,8 +805,7 @@
       <type id="tourism-picnic_site" />
       <type id="leisure-picnic_table" />
       <type id="amenity-brothel" can_add="no">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="leisure-park">
         <include field="name" />
@@ -911,21 +821,19 @@
         <include field="opening_hours" />
       </type>
       <type id="amenity-biergarten" group="food">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-community_centre">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-courthouse">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-driving_school" group="education">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-internet_cafe">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-motorcycle_parking">
         <include field="name" />
@@ -933,13 +841,13 @@
         <include field="opening_hours" />
       </type>
       <type id="amenity-music_school" group="education">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-ice_cream" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-nursing_home">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="amenity-payment_terminal">
         <include field="operator" />
@@ -979,14 +887,13 @@
         <include field="operator" />
       </type>
       <type id="leisure-fitness_centre">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="leisure-fitness_station">
         <include field="internet" />
       </type>
       <type id="leisure-sauna">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="man_made-chimney">
         <include field="height" />
@@ -1005,70 +912,67 @@
         <include field="height" />
       </type>
       <type id="shop-cosmetics" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-pet" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-bookmaker">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-erotic" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-fabric" group="shop" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-funeral_directors">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-massage">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-music" group="shop" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-musical_instrument" group="shop" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-motorcycle" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-newsagent" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-pawnbroker">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-stationery" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-seafood" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-tattoo">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-ticket" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-variety_store" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-video" group="shop" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-wholesale" group="shop">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-wine" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="shop-car_parts" group="shop">
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <!-- Uncomment this after our editor core supports complex types
       <type id="amenity-vending_machine-cigarettes">
@@ -1109,13 +1013,12 @@
       <type id="shop-car_repair-tyres">
         <tag k="shop" v="car_repair" />
         <tag k="service" v="tyres" />
-        <include group="poi" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-information-office">
         <tag k="tourism" v="information" />
         <tag k="information" v="board" />
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-information-board">
         <tag k="tourism" v="information" />
@@ -1128,26 +1031,22 @@
       <type id="leisure-sports_centre-climbing">
         <tag k="leisure" v="sports_centre" />
         <tag k="sport" v="climbing" />
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="leisure-sports_centre-shooting">
         <tag k="leisure" v="sports_centre" />
         <tag k="sport" v="shooting" />
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="leisure-sports_centre-swimming">
         <tag k="leisure" v="sports_centre" />
         <tag k="sport" v="swimming" />
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="leisure-sports_centre-yoga">
         <tag k="leisure" v="sports_centre" />
         <tag k="sport" v="yoga" />
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type-->
       <type id="natural-beach" can_add="no">
         <include field="name" />
@@ -1161,12 +1060,10 @@
       <type id="man_made-surveillance">
       </type>
       <type id="tourism-theme_park" can_add="no">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="tourism-wilderness_hut" group="accomodation">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="poi_internet" />
       </type>
       <type id="man_made-water_tap">
         <include field="name" />
diff --git a/editor/editor_tests/editor_config_test.cpp b/editor/editor_tests/editor_config_test.cpp
index cb5c4b9070..d2932e5d81 100644
--- a/editor/editor_tests/editor_config_test.cpp
+++ b/editor/editor_tests/editor_config_test.cpp
@@ -10,10 +10,11 @@ UNIT_TEST(EditorConfig_TypeDescription)
   using EType = feature::Metadata::EType;
   using Fields = editor::TypeAggregatedDescription::FeatureFields;
 
-  Fields const poi = {
+  Fields const poiInternet = {
     EType::FMD_OPEN_HOURS,
     EType::FMD_PHONE_NUMBER,
     EType::FMD_WEBSITE,
+    EType::FMD_INTERNET,
     EType::FMD_EMAIL,
     EType::FMD_LEVEL,
     EType::FMD_CONTACT_FACEBOOK,
@@ -44,10 +45,7 @@ UNIT_TEST(EditorConfig_TypeDescription)
     TEST(config.GetTypeDescription({"shop-toys"}, desc), ());
     TEST(desc.IsNameEditable(), ());
     TEST(desc.IsAddressEditable(), ());
-    auto fields = poi;
-    fields.push_back(EType::FMD_INTERNET);
-    base::SortUnique(fields);
-    TEST_EQUAL(desc.GetEditableFields(), fields, ());
+    TEST_EQUAL(desc.GetEditableFields(), poiInternet, ());
   }
   {
     // Test that amenity-bank is selected as it goes first in config.
@@ -55,17 +53,14 @@ UNIT_TEST(EditorConfig_TypeDescription)
     TEST(config.GetTypeDescription({"amenity-bicycle_rental", "amenity-bank"}, desc), ());
     TEST(desc.IsNameEditable(), ());
     TEST(desc.IsAddressEditable(), ());
-    auto fields = poi;
-    fields.push_back(EType::FMD_INTERNET);
-    base::SortUnique(fields);
-    TEST_EQUAL(desc.GetEditableFields(), fields, ());
+    TEST_EQUAL(desc.GetEditableFields(), poiInternet, ());
   }
   {
     // Testing type inheritance
     editor::TypeAggregatedDescription desc;
     TEST(config.GetTypeDescription({"amenity-place_of_worship-christian"}, desc), ());
     TEST(desc.IsNameEditable(), ());
-    TEST_EQUAL(desc.GetEditableFields(), poi, ());
+    TEST_EQUAL(desc.GetEditableFields(), poiInternet, ());
   }
   {
     // Testing long type inheritance on a fake object