diff --git a/data/presets.yaml b/data/presets.yaml
index c2d542de4..66ed5376b 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -157,6 +157,8 @@ en:
         label: Country
       covered:
         label: Covered
+      craft:
+        label: Type
       crop:
         label: Crop
       crossing:
@@ -981,6 +983,9 @@ en:
       building/warehouse:
         name: Warehouse
         terms: "<translate with synonyms or related terms for 'Warehouse', separated by commas>"
+      craft:
+        name: Craft
+        terms: "<translate with synonyms or related terms for 'Craft', separated by commas>"
       craft/basket_maker:
         name: Basket Maker
         terms: "<translate with synonyms or related terms for 'Basket Maker', separated by commas>"
@@ -1116,6 +1121,9 @@ en:
       craft/window_construction:
         name: Window Construction
         terms: "<translate with synonyms or related terms for 'Window Construction', separated by commas>"
+      craft/winery:
+        name: Winery
+        terms: "<translate with synonyms or related terms for 'Winery', separated by commas>"
       embankment:
         name: Embankment
         terms: "<translate with synonyms or related terms for 'Embankment', separated by commas>"
@@ -1755,15 +1763,33 @@ en:
       shop/alcohol:
         name: Liquor Store
         terms: "<translate with synonyms or related terms for 'Liquor Store', separated by commas>"
+      shop/anime:
+        name: Anime Shop
+        terms: "<translate with synonyms or related terms for 'Anime Shop', separated by commas>"
+      shop/antiques:
+        name: Antiques Shop
+        terms: "<translate with synonyms or related terms for 'Antiques Shop', separated by commas>"
       shop/art:
-        name: Art Shop
-        terms: "<translate with synonyms or related terms for 'Art Shop', separated by commas>"
+        name: Art Gallery
+        terms: "<translate with synonyms or related terms for 'Art Gallery', separated by commas>"
+      shop/baby_goods:
+        name: Baby Goods Store
+        terms: "<translate with synonyms or related terms for 'Baby Goods Store', separated by commas>"
+      shop/bag:
+        name: Bag/Luggage Store
+        terms: "<translate with synonyms or related terms for 'Bag/Luggage Store', separated by commas>"
       shop/bakery:
         name: Bakery
         terms: "<translate with synonyms or related terms for 'Bakery', separated by commas>"
+      shop/bathroom_furnishing:
+        name: Bathroom Furnishing Store
+        terms: "<translate with synonyms or related terms for 'Bathroom Furnishing Store', separated by commas>"
       shop/beauty:
         name: Beauty Shop
         terms: "<translate with synonyms or related terms for 'Beauty Shop', separated by commas>"
+      shop/bed:
+        name: Bedding/Mattress Store
+        terms: "<translate with synonyms or related terms for 'Bedding/Mattress Store', separated by commas>"
       shop/beverages:
         name: Beverage Store
         terms: "<translate with synonyms or related terms for 'Beverage Store', separated by commas>"
@@ -1774,14 +1800,17 @@ en:
         name: Bookmaker
         terms: "<translate with synonyms or related terms for 'Bookmaker', separated by commas>"
       shop/books:
-        name: Bookstore
-        terms: "<translate with synonyms or related terms for 'Bookstore', separated by commas>"
+        name: Book Store
+        terms: "<translate with synonyms or related terms for 'Book Store', separated by commas>"
       shop/boutique:
         name: Boutique
         terms: "<translate with synonyms or related terms for 'Boutique', separated by commas>"
       shop/butcher:
         name: Butcher
         terms: "<translate with synonyms or related terms for 'Butcher', separated by commas>"
+      shop/candles:
+        name: Candle Shop
+        terms: "<translate with synonyms or related terms for 'Candle Shop', separated by commas>"
       shop/car:
         name: Car Dealership
         terms: "<translate with synonyms or related terms for 'Car Dealership', separated by commas>"
@@ -1791,9 +1820,18 @@ en:
       shop/car_repair:
         name: Car Repair Shop
         terms: "<translate with synonyms or related terms for 'Car Repair Shop', separated by commas>"
+      shop/carpet:
+        name: Carpet Store
+        terms: "<translate with synonyms or related terms for 'Carpet Store', separated by commas>"
+      shop/cheese:
+        name: Cheese Store
+        terms: "<translate with synonyms or related terms for 'Cheese Store', separated by commas>"
       shop/chemist:
         name: Chemist
         terms: "<translate with synonyms or related terms for 'Chemist', separated by commas>"
+      shop/chocolate:
+        name: Chocolate Store
+        terms: "<translate with synonyms or related terms for 'Chocolate Store', separated by commas>"
       shop/clothes:
         name: Clothing Store
         terms: "<translate with synonyms or related terms for 'Clothing Store', separated by commas>"
@@ -1801,11 +1839,26 @@ en:
         name: Computer Store
         terms: "<translate with synonyms or related terms for 'Computer Store', separated by commas>"
       shop/confectionery:
-        name: Confectionery
-        terms: "<translate with synonyms or related terms for 'Confectionery', separated by commas>"
+        name: Candy Store
+        terms: "<translate with synonyms or related terms for 'Candy Store', separated by commas>"
       shop/convenience:
         name: Convenience Store
         terms: "<translate with synonyms or related terms for 'Convenience Store', separated by commas>"
+      shop/copyshop:
+        name: Copy Store
+        terms: "<translate with synonyms or related terms for 'Copy Store', separated by commas>"
+      shop/cosmetics:
+        name: Cosmetics Store
+        terms: "<translate with synonyms or related terms for 'Cosmetics Store', separated by commas>"
+      shop/craft:
+        name: Arts and Crafts Store
+        terms: "<translate with synonyms or related terms for 'Arts and Crafts Store', separated by commas>"
+      shop/curtain:
+        name: Curtain Store
+        terms: "<translate with synonyms or related terms for 'Curtain Store', separated by commas>"
+      shop/dairy:
+        name: Dairy Store
+        terms: "<translate with synonyms or related terms for 'Dairy Store', separated by commas>"
       shop/deli:
         name: Deli
         terms: "<translate with synonyms or related terms for 'Deli', separated by commas>"
@@ -1816,23 +1869,38 @@ en:
         name: DIY Store
         terms: "<translate with synonyms or related terms for 'DIY Store', separated by commas>"
       shop/dry_cleaning:
-        name: Dry Cleaners
-        terms: "<translate with synonyms or related terms for 'Dry Cleaners', separated by commas>"
+        name: Dry Cleaner
+        terms: "<translate with synonyms or related terms for 'Dry Cleaner', separated by commas>"
       shop/electronics:
         name: Electronics Store
         terms: "<translate with synonyms or related terms for 'Electronics Store', separated by commas>"
+      shop/erotic:
+        name: Erotic Store
+        terms: "<translate with synonyms or related terms for 'Erotic Store', separated by commas>"
+      shop/fabric:
+        name: Fabric Store
+        terms: "<translate with synonyms or related terms for 'Fabric Store', separated by commas>"
       shop/farm:
         name: Produce Stand
         terms: "<translate with synonyms or related terms for 'Produce Stand', separated by commas>"
+      shop/fashion:
+        name: Fashion Store
+        terms: "<translate with synonyms or related terms for 'Fashion Store', separated by commas>"
       shop/fishmonger:
         name: Fishmonger
         terms: "<translate with synonyms or related terms for 'Fishmonger', separated by commas>"
       shop/florist:
         name: Florist
         terms: "<translate with synonyms or related terms for 'Florist', separated by commas>"
+      shop/frame:
+        name: Framing Shop
+        terms: "<translate with synonyms or related terms for 'Framing Shop', separated by commas>"
       shop/funeral_directors:
         name: Funeral Home
         terms: "<translate with synonyms or related terms for 'Funeral Home', separated by commas>"
+      shop/furnace:
+        name: Furnace Store
+        terms: "<translate with synonyms or related terms for 'Furnace Store', separated by commas>"
       shop/furniture:
         name: Furniture Store
         terms: "<translate with synonyms or related terms for 'Furniture Store', separated by commas>"
@@ -1851,18 +1919,33 @@ en:
       shop/hardware:
         name: Hardware Store
         terms: "<translate with synonyms or related terms for 'Hardware Store', separated by commas>"
+      shop/hearing_aids:
+        name: Hearing Aids Store
+        terms: "<translate with synonyms or related terms for 'Hearing Aids Store', separated by commas>"
+      shop/herbalist:
+        name: Herbalist
+        terms: "<translate with synonyms or related terms for 'Herbalist', separated by commas>"
       shop/hifi:
         name: Hifi Store
         terms: "<translate with synonyms or related terms for 'Hifi Store', separated by commas>"
+      shop/interior_decoration:
+        name: Interior Decoration Store
+        terms: "<translate with synonyms or related terms for 'Interior Decoration Store', separated by commas>"
       shop/jewelry:
         name: Jeweler
         terms: "<translate with synonyms or related terms for 'Jeweler', separated by commas>"
       shop/kiosk:
-        name: Kiosk
-        terms: "<translate with synonyms or related terms for 'Kiosk', separated by commas>"
+        name: News Kiosk
+        terms: "<translate with synonyms or related terms for 'News Kiosk', separated by commas>"
+      shop/kitchen:
+        name: Kitchen Design Store
+        terms: "<translate with synonyms or related terms for 'Kitchen Design Store', separated by commas>"
       shop/laundry:
         name: Laundry
         terms: "<translate with synonyms or related terms for 'Laundry', separated by commas>"
+      shop/leather:
+        name: Leather Store
+        terms: "<translate with synonyms or related terms for 'Leather Store', separated by commas>"
       shop/locksmith:
         name: Locksmith
         terms: "<translate with synonyms or related terms for 'Locksmith', separated by commas>"
@@ -1872,33 +1955,69 @@ en:
       shop/mall:
         name: Mall
         terms: "<translate with synonyms or related terms for 'Mall', separated by commas>"
+      shop/massage:
+        name: Massage Shop
+        terms: "<translate with synonyms or related terms for 'Massage Shop', separated by commas>"
+      shop/medical_supply:
+        name: Medical Supply Store
+        terms: "<translate with synonyms or related terms for 'Medical Supply Store', separated by commas>"
       shop/mobile_phone:
         name: Mobile Phone Store
         terms: "<translate with synonyms or related terms for 'Mobile Phone Store', separated by commas>"
+      shop/money_lender:
+        name: Money Lender
+        terms: "<translate with synonyms or related terms for 'Money Lender', separated by commas>"
       shop/motorcycle:
         name: Motorcycle Dealership
         terms: "<translate with synonyms or related terms for 'Motorcycle Dealership', separated by commas>"
       shop/music:
         name: Music Store
         terms: "<translate with synonyms or related terms for 'Music Store', separated by commas>"
+      shop/musical_instrument:
+        name: Musical Instrument Store
+        terms: "<translate with synonyms or related terms for 'Musical Instrument Store', separated by commas>"
       shop/newsagent:
-        name: Newsagent
-        terms: "<translate with synonyms or related terms for 'Newsagent', separated by commas>"
+        name: Newspaper/Magazine Shop
+        terms: "<translate with synonyms or related terms for 'Newspaper/Magazine Shop', separated by commas>"
       shop/optician:
         name: Optician
         terms: "<translate with synonyms or related terms for 'Optician', separated by commas>"
+      shop/organic:
+        name: Organic Goods Store
+        terms: "<translate with synonyms or related terms for 'Organic Goods Store', separated by commas>"
       shop/outdoor:
-        name: Outdoor Store
-        terms: "<translate with synonyms or related terms for 'Outdoor Store', separated by commas>"
+        name: Outdoors Store
+        terms: "<translate with synonyms or related terms for 'Outdoors Store', separated by commas>"
+      shop/paint:
+        name: Paint Store
+        terms: "<translate with synonyms or related terms for 'Paint Store', separated by commas>"
+      shop/pawnbroker:
+        name: Pawn Shop
+        terms: "<translate with synonyms or related terms for 'Pawn Shop', separated by commas>"
       shop/pet:
         name: Pet Store
         terms: "<translate with synonyms or related terms for 'Pet Store', separated by commas>"
       shop/photo:
         name: Photography Store
         terms: "<translate with synonyms or related terms for 'Photography Store', separated by commas>"
+      shop/pyrotechnics:
+        name: Fireworks Store
+        terms: "<translate with synonyms or related terms for 'Fireworks Store', separated by commas>"
+      shop/radiotechnics:
+        name: Radio/Electronic Component Store
+        terms: "<translate with synonyms or related terms for 'Radio/Electronic Component Store', separated by commas>"
+      shop/religion:
+        name: Religious Store
+        terms: "<translate with synonyms or related terms for 'Religious Store', separated by commas>"
+      shop/scuba_diving:
+        name: Scuba Diving Shop
+        terms: "<translate with synonyms or related terms for 'Scuba Diving Shop', separated by commas>"
       shop/seafood:
         name: Seafood Shop
         terms: "<translate with synonyms or related terms for 'Seafood Shop', separated by commas>"
+      shop/second_hand:
+        name: Consignment/Thrift Store
+        terms: "<translate with synonyms or related terms for 'Consignment/Thrift Store', separated by commas>"
       shop/shoes:
         name: Shoe Store
         terms: "<translate with synonyms or related terms for 'Shoe Store', separated by commas>"
@@ -1914,6 +2033,18 @@ en:
       shop/tailor:
         name: Tailor
         terms: "<translate with synonyms or related terms for 'Tailor', separated by commas>"
+      shop/tattoo:
+        name: Tattoo Parlor
+        terms: "<translate with synonyms or related terms for 'Tattoo Parlor', separated by commas>"
+      shop/tea:
+        name: Tea Store
+        terms: "<translate with synonyms or related terms for 'Tea Store', separated by commas>"
+      shop/ticket:
+        name: Ticket Seller
+        terms: "<translate with synonyms or related terms for 'Ticket Seller', separated by commas>"
+      shop/tobacco:
+        name: Tobacco Shop
+        terms: "<translate with synonyms or related terms for 'Tobacco Shop', separated by commas>"
       shop/toys:
         name: Toy Store
         terms: "<translate with synonyms or related terms for 'Toy Store', separated by commas>"
@@ -1926,12 +2057,27 @@ en:
       shop/vacant:
         name: Vacant Shop
         terms: "<translate with synonyms or related terms for 'Vacant Shop', separated by commas>"
+      shop/vacuum_cleaner:
+        name: Vacuum Cleaner Store
+        terms: "<translate with synonyms or related terms for 'Vacuum Cleaner Store', separated by commas>"
       shop/variety_store:
         name: Variety Store
         terms: "<translate with synonyms or related terms for 'Variety Store', separated by commas>"
       shop/video:
         name: Video Store
         terms: "<translate with synonyms or related terms for 'Video Store', separated by commas>"
+      shop/video_games:
+        name: Video Game Store
+        terms: "<translate with synonyms or related terms for 'Video Game Store', separated by commas>"
+      shop/water_sports:
+        name: Watersport/Swim Shop
+        terms: "<translate with synonyms or related terms for 'Watersport/Swim Shop', separated by commas>"
+      shop/weapons:
+        name: Weapon Shop
+        terms: "<translate with synonyms or related terms for 'Weapon Shop', separated by commas>"
+      shop/window_blind:
+        name: Window Blind Store
+        terms: "<translate with synonyms or related terms for 'Window Blind Store', separated by commas>"
       shop/wine:
         name: Wine Shop
         terms: "<translate with synonyms or related terms for 'Wine Shop', separated by commas>"
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 44c8694a0..2d6ddcd0f 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -286,6 +286,11 @@
         "type": "check",
         "label": "Covered"
     },
+    "craft": {
+        "key": "craft",
+        "type": "typeCombo",
+        "label": "Type"
+    },
     "crop": {
         "key": "crop",
         "type": "combo",
diff --git a/data/presets/fields/craft.json b/data/presets/fields/craft.json
new file mode 100644
index 000000000..6ce9df0c0
--- /dev/null
+++ b/data/presets/fields/craft.json
@@ -0,0 +1,5 @@
+{
+    "key": "craft",
+    "type": "typeCombo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9c43a7931..7ffcd09b3 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -345,9 +345,7 @@
             "point",
             "area"
         ],
-        "terms": [
-            "art*"
-        ],
+        "terms": [],
         "tags": {
             "amenity": "arts_centre"
         },
@@ -362,6 +360,11 @@
             "point",
             "vertex"
         ],
+        "terms": [
+            "money",
+            "cash",
+            "machine"
+        ],
         "tags": {
             "amenity": "atm"
         },
@@ -378,30 +381,21 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "coffer",
-            "countinghouse",
             "credit union",
-            "depository",
-            "exchequer",
+            "check",
+            "deposit",
             "fund",
-            "hoard",
-            "investment firm",
+            "investment",
             "repository",
             "reserve",
-            "reservoir",
             "safe",
             "savings",
             "stock",
-            "stockpile",
-            "store",
-            "storehouse",
-            "thrift",
             "treasury",
-            "trust company",
+            "trust",
             "vault"
         ],
         "tags": {
@@ -412,6 +406,7 @@
     "amenity/bar": {
         "icon": "bar",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours",
@@ -419,31 +414,33 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "dive",
+            "beer",
+            "bier",
+            "booze"
+        ],
         "tags": {
             "amenity": "bar"
         },
-        "terms": [],
         "name": "Bar"
     },
     "amenity/bbq": {
-        "geometry": [
-            "point"
-        ],
-        "tags": {
-            "amenity": "bbq"
-        },
         "fields": [
             "covered",
             "fuel"
         ],
-        "terms": [
-            "barbecue",
-            "bbq",
-            "grill"
+        "geometry": [
+            "point"
         ],
+        "terms": [
+            "bbq"
+        ],
+        "tags": {
+            "amenity": "bbq"
+        },
         "name": "Barbecue/Grill"
     },
     "amenity/bench": {
@@ -474,6 +471,9 @@
             "vertex",
             "area"
         ],
+        "terms": [
+            "bike"
+        ],
         "tags": {
             "amenity": "bicycle_parking"
         },
@@ -491,6 +491,9 @@
             "vertex",
             "area"
         ],
+        "terms": [
+            "bike"
+        ],
         "tags": {
             "amenity": "bicycle_rental"
         },
@@ -518,16 +521,19 @@
             "point",
             "vertex"
         ],
-        "tags": {
-            "amenity": "bureau_de_change"
-        },
-        "name": "Currency Exchange",
         "terms": [
             "bureau de change",
             "money changer"
-        ]
+        ],
+        "tags": {
+            "amenity": "bureau_de_change"
+        },
+        "name": "Currency Exchange"
     },
     "amenity/bus_station": {
+        "fields": [
+            "operator"
+        ],
         "geometry": [
             "point",
             "area"
@@ -535,9 +541,6 @@
         "tags": {
             "amenity": "bus_station"
         },
-        "fields": [
-            "operator"
-        ],
         "name": "Bus Station"
     },
     "amenity/cafe": {
@@ -552,13 +555,11 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
             "coffee",
-            "tea",
-            "coffee shop"
+            "tea"
         ],
         "tags": {
             "amenity": "cafe"
@@ -639,12 +640,10 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
             "daycare",
-            "nursery",
             "orphanage",
             "playgroup"
         ],
@@ -662,27 +661,17 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "big screen",
-            "bijou",
-            "cine",
             "drive-in",
             "film",
-            "flicks",
-            "motion pictures",
-            "movie house",
-            "movie theater",
-            "moving pictures",
-            "nabes",
-            "photoplay",
-            "picture show",
-            "pictures",
-            "playhouse",
+            "flick",
+            "movie",
+            "theater",
+            "picture",
             "show",
-            "silver screen"
+            "screen"
         ],
         "tags": {
             "amenity": "cinema"
@@ -701,8 +690,8 @@
             "area"
         ],
         "terms": [
-            "clinic",
-            "medical clinic"
+            "medical",
+            "urgentcare"
         ],
         "tags": {
             "amenity": "clinic"
@@ -730,7 +719,6 @@
             "area"
         ],
         "terms": [
-            "college",
             "university"
         ],
         "tags": {
@@ -758,7 +746,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -778,7 +765,6 @@
             "area"
         ],
         "terms": [
-            "dentist*",
             "tooth",
             "teeth"
         ],
@@ -799,7 +785,6 @@
             "area"
         ],
         "terms": [
-            "doctor*",
             "medic*"
         ],
         "tags": {
@@ -821,7 +806,6 @@
         ],
         "terms": [
             "martial arts",
-            "dojo",
             "dojang"
         ],
         "tags": {
@@ -838,8 +822,8 @@
             "amenity": "drinking_water"
         },
         "terms": [
-            "water fountain",
-            "potable water"
+            "fountain",
+            "potable"
         ],
         "name": "Drinking Water"
     },
@@ -851,8 +835,8 @@
             "building_area"
         ],
         "geometry": [
-            "area",
-            "point"
+            "point",
+            "area"
         ],
         "tags": {
             "amenity": "embassy"
@@ -871,13 +855,14 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
             "amenity": "fast_food"
         },
-        "terms": [],
+        "terms": [
+            "restaurant"
+        ],
         "name": "Fast Food"
     },
     "amenity/fire_station": {
@@ -889,13 +874,12 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [],
         "tags": {
             "amenity": "fire_station"
         },
-        "terms": [],
         "name": "Fire Station"
     },
     "amenity/fountain": {
@@ -918,7 +902,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
@@ -943,7 +926,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -954,26 +936,26 @@
     "amenity/hospital": {
         "icon": "hospital",
         "fields": [
-            "emergency",
-            "address"
+            "operator",
+            "address",
+            "emergency"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
             "clinic",
+            "doctor",
             "emergency room",
             "health service",
             "hospice",
             "infirmary",
             "institution",
             "nursing home",
-            "rest home",
             "sanatorium",
             "sanitarium",
-            "sick bay",
+            "sick",
             "surgery",
             "ward"
         ],
@@ -993,9 +975,8 @@
             "area"
         ],
         "terms": [
-            "kindergarten",
             "kindergarden",
-            "preschool"
+            "pre-school"
         ],
         "tags": {
             "amenity": "kindergarten"
@@ -1012,24 +993,25 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "book"
+        ],
         "tags": {
             "amenity": "library"
         },
-        "terms": [],
         "name": "Library"
     },
     "amenity/marketplace": {
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -1040,6 +1022,7 @@
     "amenity/nightclub": {
         "icon": "bar",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours",
@@ -1047,7 +1030,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -1064,6 +1046,7 @@
     "amenity/parking": {
         "icon": "parking",
         "fields": [
+            "operator",
             "parking",
             "capacity",
             "fee",
@@ -1085,16 +1068,16 @@
     },
     "amenity/parking_entrance": {
         "icon": "entrance",
+        "fields": [
+            "access_simple",
+            "ref"
+        ],
         "geometry": [
             "vertex"
         ],
         "tags": {
             "amenity": "parking_entrance"
         },
-        "fields": [
-            "access_simple",
-            "ref"
-        ],
         "name": "Parking Garage Entrance/Exit"
     },
     "amenity/pharmacy": {
@@ -1107,7 +1090,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -1129,7 +1111,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
@@ -1171,7 +1152,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
@@ -1198,7 +1178,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
@@ -1210,7 +1189,6 @@
             "chancel",
             "chantry",
             "chapel",
-            "church",
             "fold",
             "house of God",
             "house of prayer",
@@ -1240,12 +1218,10 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "jewish",
-            "synagogue"
+            "jewish"
         ],
         "tags": {
             "amenity": "place_of_worship",
@@ -1262,12 +1238,10 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "muslim",
-            "mosque"
+            "muslim"
         ],
         "tags": {
             "amenity": "place_of_worship",
@@ -1284,38 +1258,19 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
             "badge",
-            "bear",
-            "blue",
-            "bluecoat",
-            "bobby",
-            "boy scout",
-            "bull",
             "constable",
             "constabulary",
             "cop",
-            "copper",
-            "corps",
-            "county mounty",
             "detective",
             "fed",
-            "flatfoot",
-            "force",
-            "fuzz",
-            "gendarme",
-            "gumshoe",
-            "heat",
             "law",
-            "law enforcement",
-            "man",
-            "narc",
-            "officers",
-            "patrolman",
-            "police"
+            "enforcement",
+            "officer",
+            "patrol"
         ],
         "tags": {
             "amenity": "police"
@@ -1336,12 +1291,8 @@
             "amenity": "post_box"
         },
         "terms": [
-            "letter drop",
-            "letterbox",
-            "mail drop",
-            "mailbox",
-            "pillar box",
-            "postbox"
+            "letter",
+            "post"
         ],
         "name": "Mailbox"
     },
@@ -1355,9 +1306,12 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "letter",
+            "mail"
+        ],
         "tags": {
             "amenity": "post_office"
         },
@@ -1373,13 +1327,17 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
             "amenity": "pub"
         },
-        "terms": [],
+        "terms": [
+            "dive",
+            "beer",
+            "bier",
+            "booze"
+        ],
         "name": "Pub"
     },
     "amenity/ranger_station": {
@@ -1419,10 +1377,15 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
-        "terms": [],
+        "terms": [
+            "can",
+            "bottle",
+            "garbage",
+            "scrap",
+            "trash"
+        ],
         "tags": {
             "amenity": "recycling"
         },
@@ -1440,42 +1403,23 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
             "bar",
-            "cafeteria",
+            "breakfast",
+            "cafe",
             "café",
             "canteen",
-            "chophouse",
-            "coffee shop",
-            "diner",
-            "dining room",
-            "dive*",
-            "doughtnut shop",
+            "coffee",
+            "dine",
+            "dining",
+            "dinner",
             "drive-in",
-            "eatery",
-            "eating house",
-            "eating place",
-            "fast-food place",
-            "fish and chips",
-            "greasy spoon",
+            "eat",
             "grill",
-            "hamburger stand",
-            "hashery",
-            "hideaway",
-            "hotdog stand",
-            "inn",
-            "joint*",
-            "luncheonette",
-            "lunchroom",
-            "night club",
-            "outlet*",
-            "pizzeria",
-            "saloon",
-            "soda fountain",
-            "watering hole"
+            "lunch",
+            "table"
         ],
         "tags": {
             "amenity": "restaurant"
@@ -1494,7 +1438,9 @@
         ],
         "terms": [
             "academy",
-            "school*"
+            "elementary school",
+            "middle school",
+            "high school"
         ],
         "tags": {
             "amenity": "school"
@@ -1510,12 +1456,14 @@
             "vertex",
             "area"
         ],
+        "terms": [
+            "lean-to",
+            "gazebo",
+            "picnic"
+        ],
         "tags": {
             "amenity": "shelter"
         },
-        "terms": [
-            "lean-to"
-        ],
         "name": "Shelter"
     },
     "amenity/social_facility": {
@@ -1570,9 +1518,9 @@
             "area"
         ],
         "terms": [
-            "elderly",
             "old",
-            "senior living"
+            "senior",
+            "living"
         ],
         "tags": {
             "amenity": "social_facility",
@@ -1618,12 +1566,9 @@
             "area"
         ],
         "terms": [
-            "recording studio",
-            "studio",
+            "recording",
             "radio",
-            "radio studio",
-            "television",
-            "television studio"
+            "television"
         ],
         "tags": {
             "amenity": "studio"
@@ -1640,10 +1585,11 @@
         "tags": {
             "amenity": "swimming_pool"
         },
-        "searchable": false,
-        "name": "Swimming Pool"
+        "name": "Swimming Pool",
+        "searchable": false
     },
     "amenity/taxi": {
+        "icon": "car",
         "fields": [
             "operator",
             "capacity"
@@ -1684,7 +1630,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
@@ -1699,6 +1644,7 @@
         "name": "Theater"
     },
     "amenity/toilets": {
+        "icon": "toilets",
         "fields": [
             "toilets/disposal",
             "operator",
@@ -1725,27 +1671,25 @@
         "tags": {
             "amenity": "toilets"
         },
-        "icon": "toilets",
         "name": "Toilets"
     },
     "amenity/townhall": {
         "icon": "town-hall",
         "fields": [
+            "operator",
             "address",
             "building_area"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "village hall",
-            "city government",
+            "village",
+            "city",
+            "government",
             "courthouse",
-            "municipal building",
-            "municipal center",
-            "municipal centre"
+            "municipal"
         ],
         "tags": {
             "amenity": "townhall"
@@ -1763,8 +1707,7 @@
             "area"
         ],
         "terms": [
-            "college",
-            "university"
+            "college"
         ],
         "tags": {
             "amenity": "university"
@@ -1779,6 +1722,11 @@
         "geometry": [
             "point"
         ],
+        "terms": [
+            "snack",
+            "soda",
+            "ticket"
+        ],
         "tags": {
             "amenity": "vending_machine"
         },
@@ -1787,6 +1735,7 @@
     "amenity/veterinary": {
         "icon": "dog-park",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -1816,10 +1765,10 @@
             "amenity": "waste_basket"
         },
         "terms": [
-            "rubbish bin",
-            "litter bin",
-            "trash can",
-            "garbage can"
+            "rubbish",
+            "litter",
+            "trash",
+            "garbage"
         ],
         "name": "Waste Basket"
     },
@@ -2066,7 +2015,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2082,7 +2030,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2097,7 +2044,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2114,7 +2060,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2130,7 +2075,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2146,7 +2090,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2162,7 +2105,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2178,11 +2120,9 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "college",
             "university"
         ],
         "tags": {
@@ -2198,7 +2138,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2214,7 +2153,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2230,7 +2168,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2247,7 +2184,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2272,7 +2208,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2288,7 +2223,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2304,7 +2238,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2320,7 +2253,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2337,7 +2269,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2363,7 +2294,6 @@
     "building/hut": {
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2379,7 +2309,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2395,13 +2324,11 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "kindergarten",
             "kindergarden",
-            "preschool"
+            "pre-school"
         ],
         "tags": {
             "building": "kindergarten"
@@ -2417,7 +2344,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2433,7 +2359,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2450,7 +2375,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2461,12 +2385,10 @@
     "building/roof": {
         "icon": "building",
         "fields": [
-            "address",
-            "levels"
+            "address"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2482,12 +2404,13 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
             "academy",
-            "school*"
+            "elementary school",
+            "middle school",
+            "high school"
         ],
         "tags": {
             "building": "school"
@@ -2502,7 +2425,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2518,7 +2440,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2534,7 +2455,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2550,7 +2470,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2583,12 +2502,10 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "college",
-            "university"
+            "college"
         ],
         "tags": {
             "building": "university"
@@ -2603,7 +2520,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -2611,6 +2527,25 @@
         },
         "name": "Warehouse"
     },
+    "craft": {
+        "icon": "marker-stroked",
+        "fields": [
+            "craft",
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "craft": "*"
+        },
+        "terms": [],
+        "name": "Craft"
+    },
     "craft/basket_maker": {
         "icon": "art-gallery",
         "fields": [
@@ -2623,9 +2558,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "basket*"
-        ],
         "tags": {
             "craft": "basket_maker"
         },
@@ -2643,9 +2575,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "bee*"
-        ],
         "tags": {
             "craft": "beekeeper"
         },
@@ -2663,9 +2592,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "blacksmith"
-        ],
         "tags": {
             "craft": "blacksmith"
         },
@@ -2683,9 +2609,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "boat builder"
-        ],
         "tags": {
             "craft": "boatbuilder"
         },
@@ -2704,7 +2627,6 @@
             "area"
         ],
         "terms": [
-            "bookbinder",
             "book repair"
         ],
         "tags": {
@@ -2725,7 +2647,8 @@
             "area"
         ],
         "terms": [
-            "brewery"
+            "beer",
+            "bier"
         ],
         "tags": {
             "craft": "brewery"
@@ -2745,7 +2668,6 @@
             "area"
         ],
         "terms": [
-            "carpenter",
             "woodworker"
         ],
         "tags": {
@@ -2765,9 +2687,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "carpet layer"
-        ],
         "tags": {
             "craft": "carpet_layer"
         },
@@ -2786,9 +2705,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "cater*"
-        ],
         "tags": {
             "craft": "caterer"
         },
@@ -2806,9 +2722,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "clock*"
-        ],
         "tags": {
             "craft": "clockmaker"
         },
@@ -2827,7 +2740,6 @@
             "area"
         ],
         "terms": [
-            "confectionary",
             "sweets",
             "candy"
         ],
@@ -2849,8 +2761,7 @@
             "area"
         ],
         "terms": [
-            "dress",
-            "dressmaker"
+            "seamstress"
         ],
         "tags": {
             "craft": "dressmaker"
@@ -2870,7 +2781,8 @@
             "area"
         ],
         "terms": [
-            "electrician"
+            "power",
+            "wire"
         ],
         "tags": {
             "craft": "electrician"
@@ -2890,7 +2802,6 @@
             "area"
         ],
         "terms": [
-            "gardener",
             "landscaper",
             "grounds keeper"
         ],
@@ -2913,7 +2824,6 @@
         ],
         "terms": [
             "glass",
-            "glass foundry",
             "stained-glass",
             "window"
         ],
@@ -2934,9 +2844,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "handicraft"
-        ],
         "tags": {
             "craft": "handicraft"
         },
@@ -2957,7 +2864,6 @@
         "terms": [
             "heat*",
             "vent*",
-            "air-conditioning",
             "air conditioning"
         ],
         "tags": {
@@ -2977,9 +2883,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "insulat*"
-        ],
         "tags": {
             "craft": "insulation"
         },
@@ -2997,11 +2900,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "jeweler",
-            "gem",
-            "diamond"
-        ],
         "tags": {
             "craft": "jeweler"
         },
@@ -3020,9 +2918,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "key*"
-        ],
         "tags": {
             "craft": "key_cutter"
         },
@@ -3040,9 +2935,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "lock*"
-        ],
         "tags": {
             "craft": "locksmith"
         },
@@ -3061,9 +2953,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "metal construction"
-        ],
         "tags": {
             "craft": "metal_construction"
         },
@@ -3081,10 +2970,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "glasses",
-            "optician"
-        ],
         "tags": {
             "craft": "optician"
         },
@@ -3103,9 +2988,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "painter"
-        ],
         "tags": {
             "craft": "painter"
         },
@@ -3123,9 +3005,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "photographer"
-        ],
         "tags": {
             "craft": "photographer"
         },
@@ -3144,7 +3023,6 @@
             "area"
         ],
         "terms": [
-            "photo*",
             "film"
         ],
         "tags": {
@@ -3164,9 +3042,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "plasterer"
-        ],
         "tags": {
             "craft": "plasterer"
         },
@@ -3185,7 +3060,7 @@
             "area"
         ],
         "terms": [
-            "pumber"
+            "pipe"
         ],
         "tags": {
             "craft": "plumber"
@@ -3205,8 +3080,7 @@
             "area"
         ],
         "terms": [
-            "potter*",
-            "ceramic*"
+            "ceramic"
         ],
         "tags": {
             "craft": "pottery"
@@ -3225,9 +3099,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "rigger"
-        ],
         "tags": {
             "craft": "rigger"
         },
@@ -3245,9 +3116,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "roofer"
-        ],
         "tags": {
             "craft": "roofer"
         },
@@ -3265,9 +3133,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "saddle*"
-        ],
         "tags": {
             "craft": "saddler"
         },
@@ -3285,9 +3150,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "sail*"
-        ],
         "tags": {
             "craft": "sailmaker"
         },
@@ -3306,7 +3168,6 @@
             "area"
         ],
         "terms": [
-            "sawmill",
             "lumber"
         ],
         "tags": {
@@ -3326,9 +3187,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "scaffolder"
-        ],
         "tags": {
             "craft": "scaffolder"
         },
@@ -3346,9 +3204,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "sculpter"
-        ],
         "tags": {
             "craft": "sculpter"
         },
@@ -3367,8 +3222,7 @@
             "area"
         ],
         "terms": [
-            "shoe repair",
-            "shoemaker"
+            "cobbler"
         ],
         "tags": {
             "craft": "shoemaker"
@@ -3388,7 +3242,6 @@
             "area"
         ],
         "terms": [
-            "stonemason",
             "masonry"
         ],
         "tags": {
@@ -3408,10 +3261,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "sweep",
-            "chimney"
-        ],
         "tags": {
             "craft": "sweep"
         },
@@ -3430,13 +3279,14 @@
             "area"
         ],
         "terms": [
-            "tailor",
-            "clothes"
+            "clothes",
+            "suit"
         ],
         "tags": {
             "craft": "tailor"
         },
-        "name": "Tailor"
+        "name": "Tailor",
+        "searchable": false
     },
     "craft/tiler": {
         "icon": "marker-stroked",
@@ -3450,9 +3300,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "tiler"
-        ],
         "tags": {
             "craft": "tiler"
         },
@@ -3470,9 +3317,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "tinsmith"
-        ],
         "tags": {
             "craft": "tinsmith"
         },
@@ -3490,9 +3334,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "upholsterer"
-        ],
         "tags": {
             "craft": "upholsterer"
         },
@@ -3510,9 +3351,6 @@
             "point",
             "area"
         ],
-        "terms": [
-            "watch*"
-        ],
         "tags": {
             "craft": "watchmaker"
         },
@@ -3531,13 +3369,30 @@
             "area"
         ],
         "terms": [
-            "window*"
+            "glass"
         ],
         "tags": {
             "craft": "window_construction"
         },
         "name": "Window Construction"
     },
+    "craft/winery": {
+        "icon": "alcohol-shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "craft": "winery"
+        },
+        "name": "Winery"
+    },
     "embankment": {
         "geometry": [
             "line"
@@ -3556,9 +3411,13 @@
             "address"
         ],
         "geometry": [
-            "area",
             "point",
-            "vertex"
+            "area"
+        ],
+        "terms": [
+            "EMS",
+            "EMT",
+            "rescue"
         ],
         "tags": {
             "emergency": "ambulance_station"
@@ -3642,7 +3501,6 @@
             "crossing": "zebra"
         },
         "terms": [
-            "crosswalk",
             "zebra crossing"
         ],
         "name": "Crosswalk"
@@ -3711,9 +3569,6 @@
             "leisure": "pitch",
             "sport": "golf"
         },
-        "terms": [
-            "putting green"
-        ],
         "name": "Putting Green"
     },
     "golf/hole": {
@@ -3811,10 +3666,8 @@
         },
         "terms": [
             "bridleway",
-            "equestrian trail",
-            "horse riding path",
-            "bridle road",
-            "horse trail"
+            "equestrian",
+            "horse"
         ],
         "name": "Bridle Path"
     },
@@ -3863,7 +3716,6 @@
             "crossing": "zebra"
         },
         "terms": [
-            "crosswalk",
             "zebra crossing"
         ],
         "name": "Crosswalk"
@@ -3884,7 +3736,9 @@
         "tags": {
             "highway": "cycleway"
         },
-        "terms": [],
+        "terms": [
+            "bike"
+        ],
         "name": "Cycle Path"
     },
     "highway/footway": {
@@ -3901,29 +3755,10 @@
             "area"
         ],
         "terms": [
-            "beaten path",
-            "boulevard",
-            "clearing",
-            "course",
-            "cut*",
-            "drag*",
-            "footpath",
-            "highway",
-            "lane",
-            "line",
-            "orbit",
-            "passage",
-            "pathway",
-            "rail",
-            "rails",
-            "road",
-            "roadway",
-            "route",
-            "street",
-            "thoroughfare",
+            "hike",
+            "hiking",
             "trackway",
             "trail",
-            "trajectory",
             "walk"
         ],
         "tags": {
@@ -4033,10 +3868,16 @@
         "geometry": [
             "line"
         ],
+        "terms": [
+            "hike",
+            "hiking",
+            "trackway",
+            "trail",
+            "walk"
+        ],
         "tags": {
             "highway": "path"
         },
-        "terms": [],
         "name": "Path"
     },
     "highway/pedestrian": {
@@ -4154,9 +3995,7 @@
             "highway": "rest_area"
         },
         "terms": [
-            "rest stop",
-            "turnout",
-            "lay-by"
+            "rest stop"
         ],
         "name": "Rest Area"
     },
@@ -4452,7 +4291,10 @@
         "tags": {
             "highway": "track"
         },
-        "terms": [],
+        "terms": [
+            "woods road",
+            "fire road"
+        ],
         "name": "Track"
     },
     "highway/traffic_signals": {
@@ -4520,7 +4362,9 @@
         "tags": {
             "highway": "turning_circle"
         },
-        "terms": [],
+        "terms": [
+            "cul-de-sac"
+        ],
         "name": "Turning Circle"
     },
     "highway/unclassified": {
@@ -4579,7 +4423,6 @@
     "historic/castle": {
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -5030,6 +4873,9 @@
             "vertex",
             "area"
         ],
+        "terms": [
+            "boat"
+        ],
         "tags": {
             "leisure": "marina"
         },
@@ -5076,8 +4922,7 @@
             "leisure": "picnic_table"
         },
         "terms": [
-            "bench",
-            "table"
+            "bench"
         ],
         "name": "Picnic Table"
     },
@@ -5095,7 +4940,9 @@
         "tags": {
             "leisure": "pitch"
         },
-        "terms": [],
+        "terms": [
+            "field"
+        ],
         "name": "Sport Pitch"
     },
     "leisure/pitch/american_football": {
@@ -5256,6 +5103,10 @@
             "point",
             "line"
         ],
+        "terms": [
+            "boat launch",
+            "boat ramp"
+        ],
         "tags": {
             "leisure": "slipway"
         },
@@ -5297,6 +5148,7 @@
         "name": "Stadium"
     },
     "leisure/swimming_pool": {
+        "icon": "swimming",
         "fields": [
             "access_simple",
             "operator",
@@ -5310,7 +5162,6 @@
         "tags": {
             "leisure": "swimming_pool"
         },
-        "icon": "swimming",
         "name": "Swimming Pool"
     },
     "leisure/track": {
@@ -6803,13 +6654,13 @@
         "icon": "shop",
         "fields": [
             "shop",
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -6821,53 +6672,125 @@
     "shop/alcohol": {
         "icon": "alcohol-shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "alcohol"
+            "alcohol",
+            "beer",
+            "booze",
+            "wine"
         ],
         "tags": {
             "shop": "alcohol"
         },
         "name": "Liquor Store"
     },
-    "shop/art": {
-        "icon": "art-gallery",
+    "shop/anime": {
+        "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
-        "terms": [
-            "art*"
+        "tags": {
+            "shop": "anime"
+        },
+        "name": "Anime Shop"
+    },
+    "shop/antiques": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "antiques"
+        },
+        "name": "Antiques Shop"
+    },
+    "shop/art": {
+        "icon": "art-gallery",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
         ],
         "tags": {
             "shop": "art"
         },
-        "name": "Art Shop"
+        "name": "Art Gallery"
     },
-    "shop/bakery": {
-        "icon": "bakery",
+    "shop/baby_goods": {
+        "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "baby_goods"
+        },
+        "name": "Baby Goods Store"
+    },
+    "shop/bag": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "handbag",
+            "purse"
+        ],
+        "tags": {
+            "shop": "bag"
+        },
+        "name": "Bag/Luggage Store"
+    },
+    "shop/bakery": {
+        "icon": "bakery",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -6875,16 +6798,33 @@
         },
         "name": "Bakery"
     },
-    "shop/beauty": {
+    "shop/bathroom_furnishing": {
         "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "bathroom_furnishing"
+        },
+        "name": "Bathroom Furnishing Store"
+    },
+    "shop/beauty": {
+        "icon": "shop",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
@@ -6898,16 +6838,33 @@
         },
         "name": "Beauty Shop"
     },
-    "shop/beverages": {
-        "icon": "shop",
+    "shop/bed": {
+        "icon": "lodging",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "bed"
+        },
+        "name": "Bedding/Mattress Store"
+    },
+    "shop/beverages": {
+        "icon": "shop",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -6918,13 +6875,13 @@
     "shop/bicycle": {
         "icon": "bicycle",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -6935,13 +6892,13 @@
     "shop/bookmaker": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -6952,30 +6909,30 @@
     "shop/books": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
             "shop": "books"
         },
-        "name": "Bookstore"
+        "name": "Book Store"
     },
     "shop/boutique": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -6986,31 +6943,55 @@
     "shop/butcher": {
         "icon": "slaughterhouse",
         "fields": [
+            "operator",
+            "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
-        "terms": [],
+        "terms": [
+            "meat"
+        ],
         "tags": {
             "shop": "butcher"
         },
         "name": "Butcher"
     },
-    "shop/car": {
-        "icon": "car",
+    "shop/candles": {
+        "icon": "shop",
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "tags": {
+            "shop": "candles"
+        },
+        "name": "Candle Shop"
+    },
+    "shop/car": {
+        "icon": "car",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "auto"
+        ],
         "tags": {
             "shop": "car"
         },
@@ -7019,15 +7000,18 @@
     "shop/car_parts": {
         "icon": "car",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "auto"
+        ],
         "tags": {
             "shop": "car_parts"
         },
@@ -7036,30 +7020,70 @@
     "shop/car_repair": {
         "icon": "car",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "auto"
+        ],
         "tags": {
             "shop": "car_repair"
         },
         "name": "Car Repair Shop"
     },
-    "shop/chemist": {
-        "icon": "chemist",
+    "shop/carpet": {
+        "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "rug"
+        ],
+        "tags": {
+            "shop": "carpet"
+        },
+        "name": "Carpet Store"
+    },
+    "shop/cheese": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "cheese"
+        },
+        "name": "Cheese Store"
+    },
+    "shop/chemist": {
+        "icon": "chemist",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7067,16 +7091,33 @@
         },
         "name": "Chemist"
     },
-    "shop/clothes": {
-        "icon": "clothing-store",
+    "shop/chocolate": {
+        "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "chocolate"
+        },
+        "name": "Chocolate Store"
+    },
+    "shop/clothes": {
+        "icon": "clothing-store",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7087,13 +7128,13 @@
     "shop/computer": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7104,30 +7145,30 @@
     "shop/confectionery": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
             "shop": "confectionery"
         },
-        "name": "Confectionery"
+        "name": "Candy Store"
     },
     "shop/convenience": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7135,18 +7176,117 @@
         },
         "name": "Convenience Store"
     },
-    "shop/deli": {
-        "icon": "restaurant",
+    "shop/copyshop": {
+        "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "tags": {
+            "shop": "copyshop"
+        },
+        "name": "Copy Store"
+    },
+    "shop/cosmetics": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "cosmetics"
+        },
+        "name": "Cosmetics Store"
+    },
+    "shop/craft": {
+        "icon": "art-gallery",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "craft"
+        },
+        "name": "Arts and Crafts Store"
+    },
+    "shop/curtain": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "drape*",
+            "window"
+        ],
+        "tags": {
+            "shop": "curtain"
+        },
+        "name": "Curtain Store"
+    },
+    "shop/dairy": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "milk",
+            "egg",
+            "cheese"
+        ],
+        "tags": {
+            "shop": "dairy"
+        },
+        "name": "Dairy Store"
+    },
+    "shop/deli": {
+        "icon": "restaurant",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "lunch",
+            "meat",
+            "sandwich"
+        ],
         "tags": {
             "shop": "deli"
         },
@@ -7155,13 +7295,13 @@
     "shop/department_store": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7172,13 +7312,13 @@
     "shop/doityourself": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7189,68 +7329,132 @@
     "shop/dry_cleaning": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
             "shop": "dry_cleaning"
         },
-        "name": "Dry Cleaners"
+        "name": "Dry Cleaner"
     },
     "shop/electronics": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "appliance",
+            "audio",
+            "computer",
+            "tv"
+        ],
         "tags": {
             "shop": "electronics"
         },
         "name": "Electronics Store"
     },
-    "shop/farm": {
+    "shop/erotic": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "sex",
+            "porn"
+        ],
         "tags": {
-            "shop": "farm"
+            "shop": "erotic"
         },
+        "name": "Erotic Store"
+    },
+    "shop/fabric": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "sew"
+        ],
+        "tags": {
+            "shop": "fabric"
+        },
+        "name": "Fabric Store"
+    },
+    "shop/farm": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
         "terms": [
             "farm shop",
             "farm stand"
         ],
+        "tags": {
+            "shop": "farm"
+        },
         "name": "Produce Stand"
     },
-    "shop/fishmonger": {
+    "shop/fashion": {
         "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "fashion"
+        },
+        "name": "Fashion Store"
+    },
+    "shop/fishmonger": {
+        "icon": "shop",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7262,23 +7466,44 @@
     "shop/florist": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "flower"
+        ],
         "tags": {
             "shop": "florist"
         },
         "name": "Florist"
     },
+    "shop/frame": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "frame"
+        },
+        "name": "Framing Shop"
+    },
     "shop/funeral_directors": {
         "icon": "cemetery",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "religion",
@@ -7286,13 +7511,10 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
             "undertaker",
-            "funeral parlour",
-            "funeral parlor",
             "memorial home"
         ],
         "tags": {
@@ -7300,18 +7522,44 @@
         },
         "name": "Funeral Home"
     },
-    "shop/furniture": {
+    "shop/furnace": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "oven",
+            "stove"
+        ],
+        "tags": {
+            "shop": "furnace"
+        },
+        "name": "Furnace Store"
+    },
+    "shop/furniture": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "chair",
+            "sofa",
+            "table"
+        ],
         "tags": {
             "shop": "furniture"
         },
@@ -7320,17 +7568,20 @@
     "shop/garden_centre": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "garden centre"
+            "landscape",
+            "mulch",
+            "shrub",
+            "tree"
         ],
         "tags": {
             "shop": "garden_centre"
@@ -7340,13 +7591,13 @@
     "shop/gift": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7357,15 +7608,19 @@
     "shop/greengrocer": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "fruit",
+            "vegetable"
+        ],
         "tags": {
             "shop": "greengrocer"
         },
@@ -7374,13 +7629,13 @@
     "shop/hairdresser": {
         "icon": "hairdresser",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7391,13 +7646,13 @@
     "shop/hardware": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7405,35 +7660,95 @@
         },
         "name": "Hardware Store"
     },
-    "shop/hifi": {
+    "shop/hearing_aids": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "tags": {
+            "shop": "hearing_aids"
+        },
+        "name": "Hearing Aids Store"
+    },
+    "shop/herbalist": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "herbalist"
+        },
+        "name": "Herbalist"
+    },
+    "shop/hifi": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "stereo",
+            "video"
+        ],
         "tags": {
             "shop": "hifi"
         },
         "name": "Hifi Store"
     },
-    "shop/jewelry": {
+    "shop/interior_decoration": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "tags": {
+            "shop": "interior_decoration"
+        },
+        "name": "Interior Decoration Store"
+    },
+    "shop/jewelry": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "diamond",
+            "gem",
+            "ring"
+        ],
         "tags": {
             "shop": "jewelry"
         },
@@ -7442,30 +7757,47 @@
     "shop/kiosk": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
             "shop": "kiosk"
         },
-        "name": "Kiosk"
+        "name": "News Kiosk"
     },
-    "shop/laundry": {
-        "icon": "laundry",
+    "shop/kitchen": {
+        "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "kitchen"
+        },
+        "name": "Kitchen Design Store"
+    },
+    "shop/laundry": {
+        "icon": "laundry",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7473,21 +7805,38 @@
         },
         "name": "Laundry"
     },
-    "shop/locksmith": {
+    "shop/leather": {
         "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "leather"
+        },
+        "name": "Leather Store"
+    },
+    "shop/locksmith": {
+        "icon": "shop",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "key*",
-            "lock*"
+            "key",
+            "lockpick"
         ],
         "tags": {
             "shop": "locksmith"
@@ -7497,13 +7846,13 @@
     "shop/lottery": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7514,13 +7863,13 @@
     "shop/mall": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7528,16 +7877,50 @@
         },
         "name": "Mall"
     },
-    "shop/mobile_phone": {
-        "icon": "mobilephone",
+    "shop/massage": {
+        "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "massage"
+        },
+        "name": "Massage Shop"
+    },
+    "shop/medical_supply": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "medical_supply"
+        },
+        "name": "Medical Supply Store"
+    },
+    "shop/mobile_phone": {
+        "icon": "mobilephone",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7545,16 +7928,33 @@
         },
         "name": "Mobile Phone Store"
     },
-    "shop/motorcycle": {
-        "icon": "scooter",
+    "shop/money_lender": {
+        "icon": "bank",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "money_lender"
+        },
+        "name": "Money Lender"
+    },
+    "shop/motorcycle": {
+        "icon": "scooter",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7565,83 +7965,169 @@
     "shop/music": {
         "icon": "music",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "CD",
+            "vinyl"
+        ],
         "tags": {
             "shop": "music"
         },
         "name": "Music Store"
     },
-    "shop/newsagent": {
-        "icon": "shop",
+    "shop/musical_instrument": {
+        "icon": "music",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "musical_instrument"
+        },
+        "name": "Musical Instrument Store"
+    },
+    "shop/newsagent": {
+        "icon": "shop",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
             "shop": "newsagent"
         },
-        "name": "Newsagent"
+        "name": "Newspaper/Magazine Shop"
     },
     "shop/optician": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "eye",
+            "glasses"
+        ],
         "tags": {
             "shop": "optician"
         },
         "name": "Optician"
     },
-    "shop/outdoor": {
+    "shop/organic": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "tags": {
+            "shop": "organic"
+        },
+        "name": "Organic Goods Store"
+    },
+    "shop/outdoor": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "camping",
+            "climbing",
+            "hiking"
+        ],
         "tags": {
             "shop": "outdoor"
         },
-        "name": "Outdoor Store"
+        "name": "Outdoors Store"
     },
-    "shop/pet": {
-        "icon": "dog-park",
+    "shop/paint": {
+        "icon": "water",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "tags": {
+            "shop": "paint"
+        },
+        "name": "Paint Store"
+    },
+    "shop/pawnbroker": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "pawnbroker"
+        },
+        "name": "Pawn Shop"
+    },
+    "shop/pet": {
+        "icon": "dog-park",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "cat",
+            "dog",
+            "fish"
+        ],
         "tags": {
             "shop": "pet"
         },
@@ -7650,50 +8136,148 @@
     "shop/photo": {
         "icon": "camera",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "camera",
+            "film"
+        ],
         "tags": {
             "shop": "photo"
         },
         "name": "Photography Store"
     },
-    "shop/seafood": {
+    "shop/pyrotechnics": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "tags": {
+            "shop": "pyrotechnics"
+        },
+        "name": "Fireworks Store"
+    },
+    "shop/radiotechnics": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "radiotechnics"
+        },
+        "name": "Radio/Electronic Component Store"
+    },
+    "shop/religion": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours",
+            "religion",
+            "denomination"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "religion"
+        },
+        "name": "Religious Store"
+    },
+    "shop/scuba_diving": {
+        "icon": "swimming",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "scuba_diving"
+        },
+        "name": "Scuba Diving Shop"
+    },
+    "shop/seafood": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "fishmonger"
+        ],
         "tags": {
             "shop": "seafood"
         },
-        "terms": [
-            "fishmonger"
-        ],
         "name": "Seafood Shop"
     },
-    "shop/shoes": {
+    "shop/second_hand": {
         "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "secondhand",
+            "second hand",
+            "resale",
+            "thrift",
+            "used"
+        ],
+        "tags": {
+            "shop": "second_hand"
+        },
+        "name": "Consignment/Thrift Store"
+    },
+    "shop/shoes": {
+        "icon": "shop",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7704,13 +8288,13 @@
     "shop/sports": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7721,15 +8305,19 @@
     "shop/stationery": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "card",
+            "paper"
+        ],
         "tags": {
             "shop": "stationery"
         },
@@ -7739,38 +8327,18 @@
         "icon": "grocery",
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "bazaar",
-            "boutique",
-            "chain",
-            "co-op",
-            "cut-rate store",
-            "discount store",
-            "five-and-dime",
-            "flea market",
-            "galleria",
-            "grocery store",
-            "mall",
-            "mart",
-            "outlet",
-            "outlet store",
-            "shop",
-            "shopping center",
-            "shopping centre",
-            "shopping plaza",
-            "stand",
+            "grocery",
             "store",
-            "supermarket",
-            "thrift shop"
+            "shop"
         ],
         "tags": {
             "shop": "supermarket"
@@ -7780,34 +8348,102 @@
     "shop/tailor": {
         "icon": "clothing-store",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "clothes",
+            "suit"
+        ],
         "tags": {
             "shop": "tailor"
         },
-        "terms": [
-            "tailor",
-            "clothes"
-        ],
         "name": "Tailor"
     },
-    "shop/toys": {
+    "shop/tattoo": {
         "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "tattoo"
+        },
+        "name": "Tattoo Parlor"
+    },
+    "shop/tea": {
+        "icon": "cafe",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "tea"
+        },
+        "name": "Tea Store"
+    },
+    "shop/ticket": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "ticket"
+        },
+        "name": "Ticket Seller"
+    },
+    "shop/tobacco": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "tobacco"
+        },
+        "name": "Tobacco Shop"
+    },
+    "shop/toys": {
+        "icon": "shop",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7818,13 +8454,13 @@
     "shop/travel_agency": {
         "icon": "suitcase",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7835,13 +8471,13 @@
     "shop/tyres": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7853,29 +8489,45 @@
         "icon": "shop",
         "fields": [
             "address",
-            "building_area",
-            "opening_hours"
+            "building_area"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
             "shop": "vacant"
         },
-        "name": "Vacant Shop"
+        "name": "Vacant Shop",
+        "searchable": false
     },
-    "shop/variety_store": {
+    "shop/vacuum_cleaner": {
         "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "vacuum_cleaner"
+        },
+        "name": "Vacuum Cleaner Store"
+    },
+    "shop/variety_store": {
+        "icon": "shop",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -7886,38 +8538,112 @@
     "shop/video": {
         "icon": "shop",
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "DVD"
+        ],
         "tags": {
             "shop": "video"
         },
         "name": "Video Store"
     },
-    "shop/wine": {
-        "icon": "alcohol-shop",
+    "shop/video_games": {
+        "icon": "shop",
         "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "video_games"
+        },
+        "name": "Video Game Store"
+    },
+    "shop/water_sports": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "water_sports"
+        },
+        "name": "Watersport/Swim Shop"
+    },
+    "shop/weapons": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "ammo",
+            "gun",
+            "knife",
+            "knives"
+        ],
+        "tags": {
+            "shop": "weapons"
+        },
+        "name": "Weapon Shop"
+    },
+    "shop/window_blind": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "window_blind"
+        },
+        "name": "Window Blind Store"
+    },
+    "shop/wine": {
+        "icon": "alcohol-shop",
+        "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
             "shop": "wine"
         },
-        "terms": [
-            "winery"
-        ],
         "name": "Wine Shop"
     },
     "tourism": {
@@ -7943,7 +8669,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -8000,9 +8725,6 @@
             "vertex",
             "area"
         ],
-        "terms": [
-            "camping"
-        ],
         "tags": {
             "tourism": "camp_site"
         },
@@ -8034,7 +8756,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -8052,7 +8773,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -8060,7 +8780,6 @@
         },
         "terms": [
             "B&B",
-            "Bed & Breakfast",
             "Bed and Breakfast"
         ],
         "name": "Guest House"
@@ -8075,7 +8794,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -8093,10 +8811,8 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
-        "terms": [],
         "tags": {
             "tourism": "hotel"
         },
@@ -8129,7 +8845,6 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -8142,27 +8857,19 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
             "exhibition",
-            "exhibits archive",
             "foundation",
             "gallery",
             "hall",
-            "institution",
-            "library",
-            "menagerie",
-            "repository",
-            "salon",
-            "storehouse",
-            "treasury",
-            "vault"
+            "institution"
         ],
         "tags": {
             "tourism": "museum"
@@ -8181,7 +8888,9 @@
             "vertex",
             "area"
         ],
-        "terms": [],
+        "terms": [
+            "camp"
+        ],
         "tags": {
             "tourism": "picnic_site"
         },
@@ -8190,11 +8899,11 @@
     "tourism/theme_park": {
         "fields": [
             "operator",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -8216,11 +8925,11 @@
         "icon": "zoo",
         "fields": [
             "operator",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "tags": {
@@ -8753,7 +9462,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8773,7 +9481,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8793,7 +9500,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8813,7 +9519,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8833,7 +9538,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8853,7 +9557,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8873,7 +9576,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8893,7 +9595,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8913,7 +9614,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8933,7 +9633,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8953,7 +9652,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8973,7 +9671,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -8993,7 +9690,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9013,7 +9709,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9033,7 +9728,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9053,7 +9747,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9073,7 +9766,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9093,7 +9785,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9113,7 +9804,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9133,7 +9823,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9153,7 +9842,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9173,7 +9861,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9193,7 +9880,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9213,7 +9899,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9233,7 +9918,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9253,7 +9937,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9273,7 +9956,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9293,7 +9975,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9313,7 +9994,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9333,7 +10013,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9353,7 +10032,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9373,7 +10051,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9393,7 +10070,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9413,7 +10089,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9433,7 +10108,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9453,7 +10127,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9473,7 +10146,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9493,7 +10165,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9513,7 +10184,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9533,7 +10203,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9553,7 +10222,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9573,7 +10241,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9593,7 +10260,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9613,7 +10279,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9633,7 +10298,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9653,7 +10317,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9673,7 +10336,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9693,7 +10355,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9713,7 +10374,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9733,7 +10393,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9753,7 +10412,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9773,7 +10431,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9793,7 +10450,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9813,7 +10469,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9833,7 +10488,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9853,7 +10507,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9873,7 +10526,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9893,7 +10545,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9913,7 +10564,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9933,7 +10583,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9953,7 +10602,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9973,7 +10621,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -9993,7 +10640,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10013,7 +10659,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10033,7 +10678,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10053,7 +10697,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10073,7 +10716,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10093,7 +10735,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10113,7 +10754,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10133,7 +10773,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10153,7 +10792,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10173,7 +10811,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10193,7 +10830,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10213,7 +10849,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10233,7 +10868,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10253,7 +10887,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10273,7 +10906,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10293,7 +10925,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10313,7 +10944,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10333,7 +10963,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10353,7 +10982,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10373,7 +11001,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10393,7 +11020,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10413,7 +11039,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10433,7 +11058,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10453,7 +11077,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10473,7 +11096,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10493,7 +11115,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10513,7 +11134,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10533,7 +11153,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10553,7 +11172,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10573,7 +11191,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10593,7 +11210,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10613,7 +11229,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10633,7 +11248,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10653,7 +11267,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10673,7 +11286,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10693,7 +11305,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10713,7 +11324,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10733,7 +11343,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10753,7 +11362,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10773,7 +11381,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10793,7 +11400,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10813,7 +11419,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10833,7 +11438,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10853,7 +11457,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10873,7 +11476,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10893,7 +11495,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10913,7 +11514,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10933,7 +11533,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10953,7 +11552,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10973,7 +11571,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -10993,7 +11590,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11013,7 +11609,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11033,7 +11628,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11053,7 +11647,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11073,7 +11666,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11093,7 +11685,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11113,7 +11704,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11133,7 +11723,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11153,7 +11742,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11173,7 +11761,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11193,7 +11780,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11213,7 +11799,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11233,7 +11818,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11253,7 +11837,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11273,7 +11856,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11293,7 +11875,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11313,7 +11894,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11333,7 +11913,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11353,7 +11932,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11373,7 +11951,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11393,7 +11970,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11413,7 +11989,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11433,7 +12008,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11453,7 +12027,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11473,7 +12046,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11493,7 +12065,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11513,7 +12084,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11533,7 +12103,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11554,7 +12123,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11574,7 +12142,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11594,7 +12161,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11614,7 +12180,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11634,7 +12199,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11654,7 +12218,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11674,7 +12237,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11694,7 +12256,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11714,7 +12275,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11734,7 +12294,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11754,7 +12313,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11774,7 +12332,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11794,7 +12351,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11814,7 +12370,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11834,7 +12389,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11854,7 +12408,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11874,7 +12427,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11894,7 +12446,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11914,7 +12465,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11934,7 +12484,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11954,7 +12503,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11974,7 +12522,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -11994,7 +12541,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12014,7 +12560,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12034,7 +12579,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12054,7 +12598,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12074,7 +12617,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12094,7 +12636,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12114,7 +12655,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12134,7 +12674,6 @@
         "icon": "fuel",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12154,7 +12693,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12174,7 +12712,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12194,7 +12731,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12214,7 +12750,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12234,7 +12769,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12254,7 +12788,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12274,7 +12807,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12294,7 +12826,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12314,7 +12845,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12334,7 +12864,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12354,7 +12883,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12374,7 +12902,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12394,7 +12921,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12414,7 +12940,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12434,7 +12959,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12454,7 +12978,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12474,7 +12997,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12494,7 +13016,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12514,7 +13035,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12534,7 +13054,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12554,7 +13073,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12574,7 +13092,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12594,7 +13111,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12614,7 +13130,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12634,7 +13149,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12654,7 +13168,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12674,7 +13187,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12694,7 +13206,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12714,7 +13225,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12734,7 +13244,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12754,7 +13263,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12774,7 +13282,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12794,7 +13301,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12814,7 +13320,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12834,7 +13339,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12854,7 +13358,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12874,7 +13377,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12894,7 +13396,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12914,7 +13415,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12934,7 +13434,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12954,7 +13453,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12974,7 +13472,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -12994,7 +13491,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13014,7 +13510,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13034,7 +13529,6 @@
         "icon": "beer",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13054,7 +13548,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13077,7 +13570,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13100,7 +13592,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13123,7 +13614,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13145,7 +13635,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13168,7 +13657,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13190,7 +13678,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13213,7 +13700,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13236,7 +13722,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13258,7 +13743,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13280,7 +13764,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13302,7 +13785,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13324,7 +13806,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13347,7 +13828,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13369,7 +13849,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13391,7 +13870,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13414,7 +13892,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13436,7 +13913,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13458,7 +13934,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13480,7 +13955,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13502,7 +13976,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13524,7 +13997,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13546,7 +14018,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13568,7 +14039,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13590,7 +14060,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13612,7 +14081,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13635,7 +14103,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13657,7 +14124,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13679,7 +14145,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13701,7 +14166,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13723,7 +14187,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13745,7 +14208,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13768,7 +14230,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13791,7 +14252,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13813,7 +14273,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13836,7 +14295,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13858,7 +14316,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13880,7 +14337,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13903,7 +14359,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13925,7 +14380,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13947,7 +14401,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13969,7 +14422,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -13992,7 +14444,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14014,7 +14465,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14036,7 +14486,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14059,7 +14508,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14083,7 +14531,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14105,7 +14552,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14127,7 +14573,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14149,7 +14594,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14171,7 +14615,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14193,7 +14636,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14217,7 +14659,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14239,7 +14680,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14261,7 +14701,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14284,7 +14723,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14306,7 +14744,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14328,7 +14765,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14350,7 +14786,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14372,7 +14807,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14394,7 +14828,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14417,7 +14850,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14439,7 +14871,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14461,7 +14892,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14483,7 +14913,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14505,7 +14934,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14527,7 +14955,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14549,7 +14976,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14571,7 +14997,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14594,7 +15019,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14616,7 +15040,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14638,7 +15061,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14660,7 +15082,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14683,7 +15104,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14706,7 +15126,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14728,7 +15147,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14750,7 +15168,6 @@
         "icon": "fast-food",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14772,7 +15189,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14794,7 +15210,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14816,7 +15231,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14838,7 +15252,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14860,7 +15273,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14882,7 +15294,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14904,7 +15315,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14926,7 +15336,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14948,7 +15357,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14970,7 +15378,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -14992,7 +15399,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15014,7 +15420,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15036,7 +15441,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15058,7 +15462,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15080,7 +15483,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15102,7 +15504,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15124,7 +15525,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15146,7 +15546,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15168,7 +15567,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15190,7 +15588,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15212,7 +15609,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15234,7 +15630,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15256,7 +15651,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15278,7 +15672,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15300,7 +15693,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15322,7 +15714,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15344,7 +15735,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15366,7 +15756,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15388,7 +15777,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15410,7 +15798,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15432,7 +15819,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15454,7 +15840,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15476,7 +15861,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15498,7 +15882,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15520,7 +15903,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15542,7 +15924,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15564,7 +15945,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15586,7 +15966,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15608,7 +15987,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15630,7 +16008,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15652,7 +16029,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15674,7 +16050,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15696,7 +16071,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15718,7 +16092,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15740,7 +16113,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15762,7 +16134,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15784,7 +16155,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15806,7 +16176,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15828,7 +16197,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15850,7 +16218,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15872,7 +16239,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15894,7 +16260,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15916,7 +16281,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15938,7 +16302,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15960,7 +16323,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -15982,7 +16344,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16004,7 +16365,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16026,7 +16386,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16048,7 +16407,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16070,7 +16428,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16092,7 +16449,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16114,7 +16470,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16136,7 +16491,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16158,7 +16512,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16180,7 +16533,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16202,7 +16554,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16224,7 +16575,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16246,7 +16596,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16268,7 +16617,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16290,7 +16638,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16312,7 +16659,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16334,7 +16680,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16356,7 +16701,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16378,7 +16722,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16400,7 +16743,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16422,7 +16764,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16444,7 +16785,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16466,7 +16806,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16488,7 +16827,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16510,7 +16848,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16532,7 +16869,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16554,7 +16890,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16576,7 +16911,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16598,7 +16932,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16620,7 +16953,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16642,7 +16974,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16664,7 +16995,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16686,7 +17016,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16708,7 +17037,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16730,7 +17058,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16752,7 +17079,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16774,7 +17100,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16796,7 +17121,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16818,7 +17142,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16840,7 +17163,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16862,7 +17184,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16884,7 +17205,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16906,7 +17226,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16928,7 +17247,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16950,7 +17268,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16972,7 +17289,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -16994,7 +17310,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17016,7 +17331,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17039,7 +17353,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17061,7 +17374,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17083,7 +17395,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17105,7 +17416,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17127,7 +17437,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17149,7 +17458,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17171,7 +17479,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17193,7 +17500,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17215,7 +17521,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17237,7 +17542,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17259,7 +17563,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17281,7 +17584,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17303,7 +17605,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17325,7 +17626,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17347,7 +17647,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17369,7 +17668,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17391,7 +17689,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17413,7 +17710,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17435,7 +17731,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17457,7 +17752,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17479,7 +17773,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17501,7 +17794,6 @@
         "icon": "restaurant",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17523,7 +17815,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17544,7 +17835,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17565,7 +17855,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17586,7 +17875,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17607,7 +17895,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17628,7 +17915,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17649,7 +17935,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17670,7 +17955,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17691,7 +17975,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17712,7 +17995,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17733,7 +18015,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17754,7 +18035,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17775,7 +18055,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17796,7 +18075,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17817,7 +18095,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17838,7 +18115,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17859,7 +18135,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17880,7 +18155,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17901,7 +18175,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17922,7 +18195,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17943,7 +18215,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17964,7 +18235,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -17985,7 +18255,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18006,7 +18275,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18027,7 +18295,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18048,7 +18315,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18069,7 +18335,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18090,7 +18355,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18111,7 +18375,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18132,7 +18395,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18153,7 +18415,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18174,7 +18435,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18195,7 +18455,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18216,7 +18475,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18237,7 +18495,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18258,7 +18515,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18279,7 +18535,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18300,7 +18555,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18321,7 +18575,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18342,7 +18595,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18363,7 +18615,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18384,7 +18635,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18405,7 +18655,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18426,7 +18675,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18447,7 +18695,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18468,7 +18715,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18489,7 +18735,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18510,7 +18755,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18531,7 +18775,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18552,7 +18795,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18573,7 +18815,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18594,7 +18835,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18615,7 +18855,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18636,7 +18875,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18657,7 +18895,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18678,7 +18915,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18699,7 +18935,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18720,7 +18955,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18741,7 +18975,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18762,7 +18995,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18783,7 +19015,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18804,7 +19035,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18825,7 +19055,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18846,7 +19075,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18867,7 +19095,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18888,7 +19115,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18909,7 +19135,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18930,7 +19155,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18951,7 +19175,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18972,7 +19195,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -18993,7 +19215,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19014,7 +19235,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19035,7 +19255,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19056,7 +19275,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19077,7 +19295,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19098,7 +19315,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19119,7 +19335,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19140,7 +19355,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19161,7 +19375,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19182,7 +19395,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19203,7 +19415,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19224,7 +19435,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19245,7 +19455,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19266,7 +19475,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19287,7 +19495,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19308,7 +19515,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19329,7 +19535,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19350,7 +19555,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19371,7 +19575,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19392,7 +19595,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19413,7 +19615,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19434,7 +19635,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19455,7 +19655,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19476,7 +19675,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19497,7 +19695,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19518,7 +19715,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19539,7 +19735,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19560,7 +19755,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19581,7 +19775,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19602,7 +19795,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19623,7 +19815,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19644,7 +19835,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19665,7 +19855,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19686,7 +19875,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19707,7 +19895,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19728,7 +19915,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19749,7 +19935,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19770,7 +19955,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19791,7 +19975,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19812,7 +19995,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19833,7 +20015,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19854,7 +20035,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19875,7 +20055,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19896,7 +20075,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19917,7 +20095,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19938,7 +20115,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19959,7 +20135,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -19980,7 +20155,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20001,7 +20175,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20022,7 +20195,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20043,7 +20215,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20064,7 +20235,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20085,7 +20255,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20106,7 +20275,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20127,7 +20295,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20148,7 +20315,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20169,7 +20335,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20190,7 +20355,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20211,7 +20375,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20232,7 +20395,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20253,7 +20415,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20274,7 +20435,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20295,7 +20455,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20316,7 +20475,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20337,7 +20495,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20358,7 +20515,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20379,7 +20535,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20400,7 +20555,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20421,7 +20575,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20442,7 +20595,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20463,7 +20615,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20484,7 +20635,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20505,7 +20655,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20526,7 +20675,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20547,7 +20695,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20568,7 +20715,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20589,7 +20735,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20610,7 +20755,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20631,7 +20775,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20652,7 +20795,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20673,7 +20815,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20694,7 +20835,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20715,7 +20855,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20736,7 +20875,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20757,7 +20895,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20778,7 +20915,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20799,7 +20935,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20820,7 +20955,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20841,7 +20975,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20862,7 +20995,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20883,7 +21015,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20904,7 +21035,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20925,7 +21055,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20946,7 +21075,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20967,7 +21095,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -20988,7 +21115,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21009,7 +21135,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21030,7 +21155,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21051,7 +21175,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21072,7 +21195,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21093,7 +21215,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21114,7 +21235,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21135,7 +21255,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21156,7 +21275,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21177,7 +21295,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21198,7 +21315,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21219,7 +21335,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21240,7 +21355,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21261,7 +21375,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21282,7 +21395,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21303,7 +21415,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21324,7 +21435,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21345,7 +21455,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21366,7 +21475,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21387,7 +21495,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21408,7 +21515,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21429,7 +21535,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21450,7 +21555,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21471,7 +21575,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21492,7 +21595,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21513,7 +21615,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21534,7 +21635,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21555,7 +21655,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21576,7 +21675,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21597,7 +21695,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21618,7 +21715,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21639,7 +21735,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21660,7 +21755,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21681,7 +21775,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21702,7 +21795,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21723,7 +21815,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21744,7 +21835,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21765,7 +21855,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21786,7 +21875,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21807,7 +21895,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21828,7 +21915,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21849,7 +21935,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21870,7 +21955,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21891,7 +21975,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21912,7 +21995,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21933,7 +22015,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21954,7 +22035,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21976,7 +22056,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -21998,7 +22077,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22020,7 +22098,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22042,7 +22119,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22064,7 +22140,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22085,7 +22160,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22106,7 +22180,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22127,7 +22200,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22148,7 +22220,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22169,7 +22240,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22190,7 +22260,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22211,7 +22280,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22233,7 +22301,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22254,7 +22321,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22275,7 +22341,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22296,7 +22361,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22317,7 +22381,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22338,7 +22401,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22359,7 +22421,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22380,7 +22441,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22401,7 +22461,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22422,7 +22481,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22443,7 +22501,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22464,7 +22521,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22485,7 +22541,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22506,7 +22561,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22527,7 +22581,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22548,7 +22601,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22569,7 +22621,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22590,7 +22641,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22611,7 +22661,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22632,7 +22681,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22654,7 +22702,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22675,7 +22722,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22696,7 +22742,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22717,7 +22762,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22738,7 +22782,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22759,7 +22802,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22780,7 +22822,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22801,7 +22842,6 @@
         "icon": "bank",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22934,7 +22974,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22954,7 +22993,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22974,7 +23012,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -22994,7 +23031,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23014,7 +23050,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23034,7 +23069,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23054,7 +23088,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23074,7 +23107,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23094,7 +23126,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23114,7 +23145,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23134,7 +23164,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23154,7 +23183,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23174,7 +23202,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23194,7 +23221,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23214,7 +23240,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23234,7 +23259,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23254,7 +23278,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23274,7 +23297,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23294,7 +23316,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23314,7 +23335,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23334,7 +23354,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23354,7 +23373,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23374,7 +23392,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23394,7 +23411,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23414,7 +23430,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23434,7 +23449,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23454,7 +23468,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23474,7 +23487,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23494,7 +23506,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23514,7 +23525,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23534,7 +23544,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23554,7 +23563,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23574,7 +23582,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23594,7 +23601,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23614,7 +23620,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23634,7 +23639,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23654,7 +23658,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23674,7 +23677,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23694,7 +23696,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23714,7 +23715,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23734,7 +23734,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23754,7 +23753,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23774,7 +23772,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23794,7 +23791,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23814,7 +23810,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23834,7 +23829,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23854,7 +23848,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23874,7 +23867,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23894,7 +23886,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23914,7 +23905,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23934,7 +23924,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23954,7 +23943,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23974,7 +23962,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -23994,7 +23981,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24014,7 +24000,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24034,7 +24019,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24054,7 +24038,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24074,7 +24057,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24094,7 +24076,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24114,7 +24095,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24134,7 +24114,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24154,7 +24133,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24174,7 +24152,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24194,7 +24171,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24214,7 +24190,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24234,7 +24209,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24254,7 +24228,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24274,7 +24247,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24294,7 +24266,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24314,7 +24285,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24334,7 +24304,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24354,7 +24323,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24374,7 +24342,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24394,7 +24361,6 @@
         "icon": "pharmacy",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24415,7 +24381,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24437,7 +24402,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24459,7 +24423,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24481,7 +24444,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24503,7 +24465,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24525,7 +24486,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24547,7 +24507,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24569,7 +24528,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24592,7 +24550,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24614,7 +24571,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24636,7 +24592,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24658,7 +24613,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24680,7 +24634,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24702,7 +24655,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24725,7 +24677,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24747,7 +24698,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24769,7 +24719,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24791,7 +24740,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24814,7 +24762,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24836,7 +24783,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24858,7 +24804,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24880,7 +24825,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24902,7 +24846,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24924,7 +24867,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24946,7 +24888,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24968,7 +24909,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -24991,7 +24931,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -25013,7 +24952,6 @@
         "icon": "cafe",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
@@ -25035,13 +24973,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25055,13 +24992,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25075,13 +25011,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25095,13 +25030,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25115,13 +25049,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25135,13 +25068,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25155,13 +25087,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25175,13 +25106,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25195,13 +25125,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25215,13 +25144,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25235,13 +25163,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25255,13 +25182,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25275,13 +25201,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25295,13 +25220,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25315,13 +25239,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25335,13 +25258,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25355,13 +25277,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25375,13 +25296,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25395,13 +25315,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25415,13 +25334,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25435,13 +25353,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25455,13 +25372,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25475,13 +25391,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25495,13 +25410,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25515,13 +25429,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25535,13 +25448,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25555,13 +25467,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25575,13 +25486,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25595,13 +25505,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25615,13 +25524,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25635,13 +25543,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25655,13 +25562,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25675,13 +25581,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25695,13 +25600,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25715,13 +25619,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25735,13 +25638,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25755,13 +25657,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25775,13 +25676,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25795,13 +25695,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25815,13 +25714,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25835,13 +25733,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25855,13 +25752,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25875,13 +25771,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25895,13 +25790,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25915,13 +25809,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25935,13 +25828,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25955,13 +25847,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25975,13 +25866,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -25995,13 +25885,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26015,13 +25904,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26035,13 +25923,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26055,13 +25942,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26075,13 +25961,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26095,13 +25980,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26115,13 +25999,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26135,13 +26018,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26155,13 +26037,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26175,13 +26056,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26195,13 +26075,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26215,13 +26094,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26235,13 +26113,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26255,13 +26132,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26275,13 +26151,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26295,13 +26170,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26315,13 +26189,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26335,13 +26208,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26355,13 +26227,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26375,13 +26246,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26395,13 +26265,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26415,13 +26284,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26435,13 +26303,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26455,13 +26322,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26475,13 +26341,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26495,13 +26360,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26515,13 +26379,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26535,13 +26398,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26555,13 +26417,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26575,13 +26436,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26595,13 +26455,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26615,13 +26474,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26635,13 +26493,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26655,13 +26512,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26675,13 +26531,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26695,13 +26550,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26715,13 +26569,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26735,13 +26588,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26755,13 +26607,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26775,13 +26626,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26795,13 +26645,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26815,13 +26664,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26835,13 +26683,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26855,13 +26702,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26875,13 +26721,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26895,13 +26740,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26915,13 +26759,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26935,13 +26778,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26955,13 +26797,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26975,13 +26816,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -26995,13 +26835,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27015,13 +26854,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27035,13 +26873,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27055,13 +26892,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27075,13 +26911,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27095,13 +26930,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27115,13 +26949,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27135,13 +26968,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27155,13 +26987,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27175,13 +27006,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27195,13 +27025,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27215,13 +27044,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27235,13 +27063,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27255,13 +27082,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27275,13 +27101,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27295,13 +27120,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27315,13 +27139,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27335,13 +27158,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27355,13 +27177,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27375,13 +27196,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27395,13 +27215,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27415,13 +27234,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27435,13 +27253,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27455,13 +27272,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27475,13 +27291,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27495,13 +27310,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27515,13 +27329,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27535,13 +27348,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27555,13 +27367,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27575,13 +27386,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27595,13 +27405,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27615,13 +27424,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27635,13 +27443,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27655,13 +27462,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27675,13 +27481,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27695,13 +27500,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27715,13 +27519,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27735,13 +27538,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27755,13 +27557,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27775,13 +27576,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27795,13 +27595,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27815,13 +27614,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27835,13 +27633,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27855,13 +27652,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27875,13 +27671,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27895,13 +27690,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27915,13 +27709,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27935,13 +27728,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27955,13 +27747,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27975,13 +27766,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -27995,13 +27785,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28015,13 +27804,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28035,13 +27823,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28055,13 +27842,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28075,13 +27861,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28095,13 +27880,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28115,13 +27899,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28135,13 +27918,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28155,13 +27937,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28175,13 +27956,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28195,13 +27975,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28215,13 +27994,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28235,13 +28013,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28255,13 +28032,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28275,13 +28051,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28295,13 +28070,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28315,13 +28089,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28335,13 +28108,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28355,13 +28127,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28375,13 +28146,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28395,13 +28165,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28415,13 +28184,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28435,13 +28203,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28455,13 +28222,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28475,13 +28241,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28495,13 +28260,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28515,13 +28279,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28535,13 +28298,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28555,13 +28317,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28575,13 +28336,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28595,13 +28355,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28615,13 +28374,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28635,13 +28393,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28655,13 +28412,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28675,13 +28431,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28695,13 +28450,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28715,13 +28469,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28735,13 +28488,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28755,13 +28507,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28775,13 +28526,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28795,13 +28545,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28815,13 +28564,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28835,13 +28583,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28855,13 +28602,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28875,13 +28621,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28895,13 +28640,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28915,13 +28659,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28935,13 +28678,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28955,13 +28697,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28975,13 +28716,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -28995,13 +28735,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29015,13 +28754,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29035,13 +28773,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29055,13 +28792,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29075,13 +28811,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29095,13 +28830,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29115,13 +28849,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29135,13 +28868,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29155,13 +28887,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29175,13 +28906,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29195,13 +28925,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29215,13 +28944,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29235,13 +28963,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29255,13 +28982,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29275,13 +29001,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29295,13 +29020,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29315,13 +29039,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29335,13 +29058,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29355,13 +29077,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29375,13 +29096,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29395,13 +29115,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29415,13 +29134,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29435,13 +29153,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29455,13 +29172,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29475,13 +29191,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29495,13 +29210,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29515,13 +29229,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29535,13 +29248,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29555,13 +29267,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29575,13 +29286,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29595,13 +29305,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29615,13 +29324,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29635,13 +29343,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29655,13 +29362,12 @@
         "icon": "grocery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -29675,10 +29381,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29694,10 +29400,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29713,10 +29419,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29732,10 +29438,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29751,10 +29457,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29770,10 +29476,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29789,10 +29495,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29808,10 +29514,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29827,10 +29533,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29846,10 +29552,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29865,10 +29571,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29884,10 +29590,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29903,10 +29609,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29922,10 +29628,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29941,10 +29647,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29960,10 +29666,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29979,10 +29685,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -29998,10 +29704,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30017,10 +29723,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30036,10 +29742,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30055,10 +29761,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30074,10 +29780,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30093,10 +29799,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30112,10 +29818,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30131,10 +29837,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30150,10 +29856,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30169,10 +29875,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30188,10 +29894,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30208,10 +29914,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30228,10 +29934,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30247,10 +29953,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30266,10 +29972,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30285,10 +29991,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30304,10 +30010,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30323,10 +30029,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30342,10 +30048,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30361,10 +30067,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30380,10 +30086,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30399,10 +30105,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30418,10 +30124,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30437,10 +30143,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30456,10 +30162,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30475,10 +30181,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30495,10 +30201,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30515,10 +30221,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30534,10 +30240,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30553,10 +30259,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30572,10 +30278,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30591,10 +30297,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30610,10 +30316,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30629,10 +30335,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30649,10 +30355,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30668,10 +30374,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30687,10 +30393,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30706,10 +30412,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30725,10 +30431,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30744,10 +30450,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30763,10 +30469,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30782,10 +30488,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30802,10 +30508,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30821,10 +30527,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30840,10 +30546,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30859,10 +30565,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30878,10 +30584,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30897,10 +30603,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30916,10 +30622,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30935,10 +30641,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30954,10 +30660,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30973,10 +30679,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -30992,10 +30698,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31011,10 +30717,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31030,10 +30736,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31049,10 +30755,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31068,10 +30774,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31087,10 +30793,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31106,10 +30812,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31125,10 +30831,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31144,10 +30850,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31163,10 +30869,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31182,10 +30888,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31201,10 +30907,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31220,10 +30926,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31239,10 +30945,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31258,10 +30964,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31277,10 +30983,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31296,10 +31002,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31315,10 +31021,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31334,10 +31040,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31353,10 +31059,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31372,10 +31078,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31391,10 +31097,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31410,10 +31116,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31429,10 +31135,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31448,10 +31154,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31467,10 +31173,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31486,10 +31192,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31505,10 +31211,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31524,10 +31230,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31543,10 +31249,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31562,10 +31268,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31581,10 +31287,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31600,10 +31306,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31619,10 +31325,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31638,10 +31344,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31657,10 +31363,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31676,10 +31382,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31695,10 +31401,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31714,10 +31420,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31733,10 +31439,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31752,10 +31458,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31771,10 +31477,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31790,10 +31496,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31809,10 +31515,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31828,10 +31534,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31847,10 +31553,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31866,10 +31572,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31885,10 +31591,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31904,10 +31610,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31923,10 +31629,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31942,10 +31648,10 @@
         "icon": "chemist",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31961,10 +31667,10 @@
         "icon": "chemist",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31980,10 +31686,10 @@
         "icon": "chemist",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -31999,10 +31705,10 @@
         "icon": "chemist",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32018,10 +31724,10 @@
         "icon": "chemist",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32037,10 +31743,10 @@
         "icon": "chemist",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32056,10 +31762,10 @@
         "icon": "chemist",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32075,10 +31781,10 @@
         "icon": "chemist",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32094,10 +31800,10 @@
         "icon": "chemist",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32113,10 +31819,10 @@
         "icon": "chemist",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32132,10 +31838,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32151,10 +31857,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32170,10 +31876,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32189,10 +31895,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32208,10 +31914,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32227,10 +31933,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32246,10 +31952,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32265,10 +31971,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32284,10 +31990,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32303,10 +32009,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32322,10 +32028,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32341,10 +32047,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32360,10 +32066,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32379,10 +32085,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32398,10 +32104,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32417,10 +32123,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32436,10 +32142,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32455,10 +32161,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32474,10 +32180,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32493,10 +32199,10 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32512,10 +32218,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32531,10 +32237,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32550,10 +32256,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32569,10 +32275,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32588,10 +32294,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32607,10 +32313,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32626,10 +32332,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32645,10 +32351,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32664,10 +32370,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32683,10 +32389,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32702,10 +32408,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32721,10 +32427,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32740,10 +32446,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32759,10 +32465,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32778,10 +32484,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32797,10 +32503,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32816,10 +32522,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32835,10 +32541,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32854,10 +32560,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32873,10 +32579,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32892,10 +32598,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32911,10 +32617,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32930,10 +32636,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32949,10 +32655,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32968,10 +32674,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -32987,10 +32693,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33006,10 +32712,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33025,10 +32731,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33044,10 +32750,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33063,10 +32769,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33082,10 +32788,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33101,10 +32807,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33120,10 +32826,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33139,10 +32845,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33158,10 +32864,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33177,10 +32883,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33196,10 +32902,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33215,10 +32921,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33234,10 +32940,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33253,10 +32959,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33272,10 +32978,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33291,10 +32997,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33310,10 +33016,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33329,10 +33035,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33348,10 +33054,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33367,10 +33073,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33386,11 +33092,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33404,11 +33111,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33422,11 +33130,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33440,11 +33149,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33458,11 +33168,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33476,11 +33187,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33494,11 +33206,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33512,11 +33225,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33530,11 +33244,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33548,11 +33263,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33566,11 +33282,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33584,11 +33301,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33602,11 +33320,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33620,11 +33339,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33638,11 +33358,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33656,11 +33377,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33674,11 +33396,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33692,11 +33415,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33710,11 +33434,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33728,11 +33453,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33746,11 +33472,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33764,11 +33491,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33782,11 +33510,12 @@
         "icon": "car",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -33800,10 +33529,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33819,10 +33548,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33838,10 +33567,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33857,10 +33586,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33876,10 +33605,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33895,10 +33624,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33914,10 +33643,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33933,10 +33662,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33952,10 +33681,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33971,10 +33700,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -33990,10 +33719,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34009,10 +33738,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34028,10 +33757,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34047,10 +33776,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34066,10 +33795,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34085,10 +33814,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34104,10 +33833,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34123,10 +33852,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34142,10 +33871,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34161,10 +33890,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34180,10 +33909,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34199,10 +33928,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34218,10 +33947,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34237,10 +33966,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34256,10 +33985,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34275,10 +34004,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34294,10 +34023,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34313,10 +34042,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34332,10 +34061,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34351,10 +34080,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34370,10 +34099,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34389,10 +34118,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34408,10 +34137,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34427,10 +34156,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34446,10 +34175,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34465,10 +34194,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34484,10 +34213,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34503,10 +34232,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34522,10 +34251,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34541,10 +34270,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34560,10 +34289,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34579,10 +34308,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34598,10 +34327,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34617,10 +34346,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34636,10 +34365,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34655,10 +34384,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34674,10 +34403,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34693,10 +34422,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34712,10 +34441,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34731,10 +34460,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34750,10 +34479,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34769,10 +34498,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34788,10 +34517,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34807,10 +34536,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34826,10 +34555,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34845,10 +34574,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34864,10 +34593,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34883,10 +34612,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34902,10 +34631,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34921,10 +34650,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34940,10 +34669,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34959,10 +34688,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34978,10 +34707,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -34997,10 +34726,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35016,10 +34745,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35035,10 +34764,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35054,10 +34783,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35073,10 +34802,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35092,10 +34821,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35111,10 +34840,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35130,10 +34859,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35149,10 +34878,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35168,10 +34897,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35187,10 +34916,10 @@
         "icon": "clothing-store",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35206,10 +34935,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35225,10 +34954,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35244,10 +34973,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35263,10 +34992,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35282,10 +35011,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35301,10 +35030,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35320,10 +35049,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35339,10 +35068,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35358,10 +35087,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35377,10 +35106,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35396,10 +35125,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35415,10 +35144,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35434,10 +35163,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35453,10 +35182,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35472,10 +35201,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35491,10 +35220,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35510,10 +35239,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35529,10 +35258,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35548,10 +35277,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35567,10 +35296,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35586,10 +35315,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35605,10 +35334,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35624,10 +35353,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35643,10 +35372,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35662,10 +35391,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35681,10 +35410,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35700,10 +35429,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35719,10 +35448,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35738,10 +35467,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35757,10 +35486,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35776,10 +35505,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35795,10 +35524,10 @@
         "icon": "alcohol-shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35814,10 +35543,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35833,10 +35562,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35852,10 +35581,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35871,10 +35600,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35890,10 +35619,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35909,10 +35638,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35928,10 +35657,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35947,10 +35676,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35966,10 +35695,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -35985,10 +35714,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36004,10 +35733,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36023,10 +35752,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36042,10 +35771,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36061,10 +35790,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36080,10 +35809,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36099,10 +35828,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36118,10 +35847,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36137,10 +35866,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36156,10 +35885,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36175,10 +35904,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36194,10 +35923,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36213,10 +35942,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36232,10 +35961,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36251,10 +35980,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36270,10 +35999,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36289,10 +36018,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36308,10 +36037,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36327,10 +36056,10 @@
         "icon": "bakery",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36346,10 +36075,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36365,10 +36094,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36384,10 +36113,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36403,10 +36132,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36422,10 +36151,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36441,10 +36170,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36460,10 +36189,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36479,10 +36208,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36498,10 +36227,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36517,10 +36246,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36536,10 +36265,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36555,10 +36284,10 @@
         "icon": "dog-park",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36574,10 +36303,10 @@
         "icon": "dog-park",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36593,10 +36322,10 @@
         "icon": "dog-park",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36612,10 +36341,10 @@
         "icon": "dog-park",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36631,10 +36360,10 @@
         "icon": "dog-park",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36650,10 +36379,10 @@
         "icon": "dog-park",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36669,10 +36398,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36688,10 +36417,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36707,10 +36436,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36726,10 +36455,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36745,10 +36474,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36764,10 +36493,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36783,10 +36512,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36802,10 +36531,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36821,10 +36550,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36840,10 +36569,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36859,10 +36588,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36878,10 +36607,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36897,10 +36626,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36916,10 +36645,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36935,10 +36664,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36954,10 +36683,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36973,10 +36702,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -36992,10 +36721,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37011,10 +36740,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37030,10 +36759,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37049,10 +36778,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37068,10 +36797,10 @@
         "icon": "suitcase",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37087,10 +36816,10 @@
         "icon": "suitcase",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37106,10 +36835,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37125,10 +36854,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37144,10 +36873,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37163,10 +36892,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37182,10 +36911,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37201,10 +36930,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37220,10 +36949,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37239,10 +36968,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37258,10 +36987,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37277,10 +37006,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37296,10 +37025,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37315,10 +37044,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37334,10 +37063,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37353,10 +37082,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37372,10 +37101,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37391,10 +37120,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37410,10 +37139,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37429,10 +37158,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37448,10 +37177,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37467,10 +37196,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37486,10 +37215,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37505,10 +37234,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37524,10 +37253,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37543,10 +37272,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37562,10 +37291,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37581,10 +37310,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37600,10 +37329,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37619,10 +37348,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37638,10 +37367,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37657,10 +37386,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37676,10 +37405,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37695,10 +37424,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37714,10 +37443,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37733,10 +37462,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37752,10 +37481,10 @@
         "icon": "mobilephone",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37771,10 +37500,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37790,10 +37519,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37809,10 +37538,10 @@
         "icon": "hairdresser",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37828,10 +37557,10 @@
         "icon": "hairdresser",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37847,10 +37576,10 @@
         "icon": "hairdresser",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37866,10 +37595,10 @@
         "icon": "hairdresser",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37885,10 +37614,10 @@
         "icon": "hairdresser",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37904,10 +37633,10 @@
         "icon": "hairdresser",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37923,10 +37652,10 @@
         "icon": "hairdresser",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37942,10 +37671,10 @@
         "icon": "hairdresser",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37961,10 +37690,10 @@
         "icon": "hairdresser",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37980,10 +37709,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -37999,10 +37728,10 @@
         "icon": "shop",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
@@ -38018,10 +37747,10 @@
         "icon": "scooter",
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "fields": [
+            "operator",
             "address",
             "building_area",
             "opening_hours"
diff --git a/data/presets/presets/amenity/arts_centre.json b/data/presets/presets/amenity/arts_centre.json
index 3718d908e..f2a5f35f5 100644
--- a/data/presets/presets/amenity/arts_centre.json
+++ b/data/presets/presets/amenity/arts_centre.json
@@ -10,7 +10,6 @@
         "area"
     ],
     "terms": [
-        "art*"
     ],
     "tags": {
         "amenity": "arts_centre"
diff --git a/data/presets/presets/amenity/atm.json b/data/presets/presets/amenity/atm.json
index 04aa55b21..b42a18b7d 100644
--- a/data/presets/presets/amenity/atm.json
+++ b/data/presets/presets/amenity/atm.json
@@ -7,6 +7,11 @@
         "point",
         "vertex"
     ],
+    "terms": [
+        "money",
+        "cash",
+        "machine"
+    ],
     "tags": {
         "amenity": "atm"
     },
diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json
index abedbf950..5408ffd42 100644
--- a/data/presets/presets/amenity/bank.json
+++ b/data/presets/presets/amenity/bank.json
@@ -9,30 +9,21 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "coffer",
-        "countinghouse",
         "credit union",
-        "depository",
-        "exchequer",
+        "check",
+        "deposit",
         "fund",
-        "hoard",
-        "investment firm",
+        "investment",
         "repository",
         "reserve",
-        "reservoir",
         "safe",
         "savings",
         "stock",
-        "stockpile",
-        "store",
-        "storehouse",
-        "thrift",
         "treasury",
-        "trust company",
+        "trust",
         "vault"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
index 0b8f0fec0..b9bf68f03 100644
--- a/data/presets/presets/amenity/bar.json
+++ b/data/presets/presets/amenity/bar.json
@@ -1,6 +1,7 @@
 {
     "icon": "bar",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours",
@@ -8,12 +9,16 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "dive",
+        "beer",
+        "bier",
+        "booze"
+    ],
     "tags": {
         "amenity": "bar"
     },
-    "terms": [],
     "name": "Bar"
 }
diff --git a/data/presets/presets/amenity/bbq.json b/data/presets/presets/amenity/bbq.json
index f04001f50..ea15bf7c4 100644
--- a/data/presets/presets/amenity/bbq.json
+++ b/data/presets/presets/amenity/bbq.json
@@ -1,18 +1,16 @@
 {
-    "geometry": [
-        "point"
-    ],
-    "tags": {
-        "amenity": "bbq"
-    },
     "fields": [
         "covered",
         "fuel"
     ],
-    "terms": [
-        "barbecue",
-        "bbq",
-        "grill"
+    "geometry": [
+        "point"
     ],
+    "terms": [
+        "bbq"
+    ],
+    "tags": {
+        "amenity": "bbq"
+    },
     "name": "Barbecue/Grill"
 }
diff --git a/data/presets/presets/amenity/bicycle_parking.json b/data/presets/presets/amenity/bicycle_parking.json
index 7b767500b..3ee9dcea9 100644
--- a/data/presets/presets/amenity/bicycle_parking.json
+++ b/data/presets/presets/amenity/bicycle_parking.json
@@ -12,8 +12,11 @@
         "vertex",
         "area"
     ],
+    "terms": [
+        "bike"
+    ],
     "tags": {
         "amenity": "bicycle_parking"
     },
     "name": "Bicycle Parking"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json
index adc58e6b9..3a47e707c 100644
--- a/data/presets/presets/amenity/bicycle_rental.json
+++ b/data/presets/presets/amenity/bicycle_rental.json
@@ -10,8 +10,11 @@
         "vertex",
         "area"
     ],
+    "terms": [
+        "bike"
+    ],
     "tags": {
         "amenity": "bicycle_rental"
     },
     "name": "Bicycle Rental"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/bureau_de_change.json b/data/presets/presets/amenity/bureau_de_change.json
index e20b60951..8a87551d9 100644
--- a/data/presets/presets/amenity/bureau_de_change.json
+++ b/data/presets/presets/amenity/bureau_de_change.json
@@ -7,12 +7,12 @@
         "point",
         "vertex"
     ],
-    "tags": {
-        "amenity": "bureau_de_change"
-    },
-    "name": "Currency Exchange",
     "terms": [
         "bureau de change",
         "money changer"
-    ]
+    ],
+    "tags": {
+        "amenity": "bureau_de_change"
+    },
+    "name": "Currency Exchange"
 }
diff --git a/data/presets/presets/amenity/bus_station.json b/data/presets/presets/amenity/bus_station.json
index 9667fb016..64d58b43a 100644
--- a/data/presets/presets/amenity/bus_station.json
+++ b/data/presets/presets/amenity/bus_station.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "operator"
+    ],
     "geometry": [
         "point",
         "area"
@@ -6,8 +9,5 @@
     "tags": {
         "amenity": "bus_station"
     },
-    "fields": [
-        "operator"
-    ],
     "name": "Bus Station"
 }
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
index 5ffa46157..b4fe166da 100644
--- a/data/presets/presets/amenity/cafe.json
+++ b/data/presets/presets/amenity/cafe.json
@@ -10,13 +10,11 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
         "coffee",
-        "tea",
-        "coffee shop"
+        "tea"
     ],
     "tags": {
         "amenity": "cafe"
diff --git a/data/presets/presets/amenity/childcare.json b/data/presets/presets/amenity/childcare.json
index a2c647f9b..a33ec9994 100644
--- a/data/presets/presets/amenity/childcare.json
+++ b/data/presets/presets/amenity/childcare.json
@@ -8,12 +8,10 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
         "daycare",
-        "nursery",
         "orphanage",
         "playgroup"
     ],
diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json
index 20f5a11ca..45357048a 100644
--- a/data/presets/presets/amenity/cinema.json
+++ b/data/presets/presets/amenity/cinema.json
@@ -7,27 +7,17 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "big screen",
-        "bijou",
-        "cine",
         "drive-in",
         "film",
-        "flicks",
-        "motion pictures",
-        "movie house",
-        "movie theater",
-        "moving pictures",
-        "nabes",
-        "photoplay",
-        "picture show",
-        "pictures",
-        "playhouse",
+        "flick",
+        "movie",
+        "theater",
+        "picture",
         "show",
-        "silver screen"
+        "screen"
     ],
     "tags": {
         "amenity": "cinema"
diff --git a/data/presets/presets/amenity/clinic.json b/data/presets/presets/amenity/clinic.json
index b0fb2be4d..f5b64581e 100644
--- a/data/presets/presets/amenity/clinic.json
+++ b/data/presets/presets/amenity/clinic.json
@@ -10,8 +10,8 @@
         "area"
     ],
     "terms": [
-        "clinic",
-        "medical clinic"
+        "medical",
+        "urgentcare"
     ],
     "tags": {
         "amenity": "clinic"
diff --git a/data/presets/presets/amenity/college.json b/data/presets/presets/amenity/college.json
index 4d0f5f18c..5c5f16e28 100644
--- a/data/presets/presets/amenity/college.json
+++ b/data/presets/presets/amenity/college.json
@@ -9,7 +9,6 @@
         "area"
     ],
     "terms": [
-        "college",
         "university"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/courthouse.json b/data/presets/presets/amenity/courthouse.json
index eee6ec11b..431a13c1a 100644
--- a/data/presets/presets/amenity/courthouse.json
+++ b/data/presets/presets/amenity/courthouse.json
@@ -7,7 +7,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/dentist.json b/data/presets/presets/amenity/dentist.json
index e0482c089..5a6e798a8 100644
--- a/data/presets/presets/amenity/dentist.json
+++ b/data/presets/presets/amenity/dentist.json
@@ -10,7 +10,6 @@
         "area"
     ],
     "terms": [
-        "dentist*",
         "tooth",
         "teeth"
     ],
diff --git a/data/presets/presets/amenity/doctor.json b/data/presets/presets/amenity/doctor.json
index cf874a11b..3753f26f4 100644
--- a/data/presets/presets/amenity/doctor.json
+++ b/data/presets/presets/amenity/doctor.json
@@ -10,7 +10,6 @@
         "area"
     ],
     "terms": [
-        "doctor*",
         "medic*"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/dojo.json b/data/presets/presets/amenity/dojo.json
index 38fa51f4f..37a6ece19 100644
--- a/data/presets/presets/amenity/dojo.json
+++ b/data/presets/presets/amenity/dojo.json
@@ -7,11 +7,11 @@
         "opening_hours"
     ],
     "geometry" : [
-        "point", "area"
+        "point",
+        "area"
     ],
     "terms": [
         "martial arts",
-        "dojo",
         "dojang"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/drinking_water.json b/data/presets/presets/amenity/drinking_water.json
index f649c3ce7..9437c6024 100644
--- a/data/presets/presets/amenity/drinking_water.json
+++ b/data/presets/presets/amenity/drinking_water.json
@@ -7,8 +7,8 @@
         "amenity": "drinking_water"
     },
     "terms": [
-        "water fountain",
-        "potable water"
+        "fountain",
+        "potable"
     ],
     "name": "Drinking Water"
 }
diff --git a/data/presets/presets/amenity/embassy.json b/data/presets/presets/amenity/embassy.json
index 8cfe63468..c871d9ba3 100644
--- a/data/presets/presets/amenity/embassy.json
+++ b/data/presets/presets/amenity/embassy.json
@@ -6,8 +6,8 @@
         "building_area"
     ],
     "geometry": [
-        "area",
-        "point"
+        "point",
+        "area"
     ],
     "tags": {
         "amenity": "embassy"
diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json
index aa13b4107..a73c2c112 100644
--- a/data/presets/presets/amenity/fast_food.json
+++ b/data/presets/presets/amenity/fast_food.json
@@ -10,12 +10,13 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "amenity": "fast_food"
     },
-    "terms": [],
+    "terms": [
+        "restaurant"
+    ],
     "name": "Fast Food"
 }
diff --git a/data/presets/presets/amenity/fire_station.json b/data/presets/presets/amenity/fire_station.json
index 58d2b00c5..35acbc5bd 100644
--- a/data/presets/presets/amenity/fire_station.json
+++ b/data/presets/presets/amenity/fire_station.json
@@ -7,12 +7,11 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [],
     "tags": {
         "amenity": "fire_station"
     },
-    "terms": [],
     "name": "Fire Station"
 }
diff --git a/data/presets/presets/amenity/fuel.json b/data/presets/presets/amenity/fuel.json
index b0a65c0c7..67ba90e95 100644
--- a/data/presets/presets/amenity/fuel.json
+++ b/data/presets/presets/amenity/fuel.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
diff --git a/data/presets/presets/amenity/grave_yard.json b/data/presets/presets/amenity/grave_yard.json
index e71015c50..65825736a 100644
--- a/data/presets/presets/amenity/grave_yard.json
+++ b/data/presets/presets/amenity/grave_yard.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json
index 14331962d..87a2d0ba1 100644
--- a/data/presets/presets/amenity/hospital.json
+++ b/data/presets/presets/amenity/hospital.json
@@ -1,26 +1,26 @@
 {
     "icon": "hospital",
     "fields": [
-        "emergency",
-        "address"
+        "operator",
+        "address",
+        "emergency"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
         "clinic",
+        "doctor",
         "emergency room",
         "health service",
         "hospice",
         "infirmary",
         "institution",
         "nursing home",
-        "rest home",
         "sanatorium",
         "sanitarium",
-        "sick bay",
+        "sick",
         "surgery",
         "ward"
     ],
@@ -28,4 +28,4 @@
         "amenity": "hospital"
     },
     "name": "Hospital Grounds"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json
index cd6978469..2d28d6afe 100644
--- a/data/presets/presets/amenity/kindergarten.json
+++ b/data/presets/presets/amenity/kindergarten.json
@@ -9,9 +9,8 @@
         "area"
     ],
     "terms": [
-        "kindergarten",
         "kindergarden",
-        "preschool"
+        "pre-school"
     ],
     "tags": {
         "amenity": "kindergarten"
diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
index ace9b4855..8c868a980 100644
--- a/data/presets/presets/amenity/library.json
+++ b/data/presets/presets/amenity/library.json
@@ -8,12 +8,13 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "book"
+    ],
     "tags": {
         "amenity": "library"
     },
-    "terms": [],
     "name": "Library"
 }
diff --git a/data/presets/presets/amenity/marketplace.json b/data/presets/presets/amenity/marketplace.json
index 301dbdd65..1b91ce0e1 100644
--- a/data/presets/presets/amenity/marketplace.json
+++ b/data/presets/presets/amenity/marketplace.json
@@ -1,12 +1,12 @@
 {
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/nightclub.json b/data/presets/presets/amenity/nightclub.json
index 47f2efae9..67ff6e58c 100644
--- a/data/presets/presets/amenity/nightclub.json
+++ b/data/presets/presets/amenity/nightclub.json
@@ -1,6 +1,7 @@
 {
     "icon": "bar",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours",
@@ -8,7 +9,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
index 0c362e6b4..eb89c3ab6 100644
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -1,6 +1,7 @@
 {
     "icon": "parking",
     "fields": [
+        "operator",
         "parking",
         "capacity",
         "fee",
diff --git a/data/presets/presets/amenity/parking_entrance.json b/data/presets/presets/amenity/parking_entrance.json
index 1ed038918..ecf2b7f3b 100644
--- a/data/presets/presets/amenity/parking_entrance.json
+++ b/data/presets/presets/amenity/parking_entrance.json
@@ -1,14 +1,14 @@
 {
     "icon": "entrance",
+    "fields": [
+        "access_simple",
+        "ref"
+    ],
     "geometry": [
         "vertex"
     ],
     "tags": {
         "amenity": "parking_entrance"
     },
-    "fields": [
-        "access_simple",
-        "ref"
-    ],
     "name": "Parking Garage Entrance/Exit"
 }
diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json
index 4cc1e4621..9f9a529f0 100644
--- a/data/presets/presets/amenity/pharmacy.json
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json
index 8432eec5a..b0ed988f0 100644
--- a/data/presets/presets/amenity/place_of_worship.json
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
diff --git a/data/presets/presets/amenity/place_of_worship/buddhist.json b/data/presets/presets/amenity/place_of_worship/buddhist.json
index 8bab80f9b..bb3f084f9 100644
--- a/data/presets/presets/amenity/place_of_worship/buddhist.json
+++ b/data/presets/presets/amenity/place_of_worship/buddhist.json
@@ -7,7 +7,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json
index 00ed6724b..8f10af709 100644
--- a/data/presets/presets/amenity/place_of_worship/christian.json
+++ b/data/presets/presets/amenity/place_of_worship/christian.json
@@ -7,7 +7,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
@@ -19,7 +18,6 @@
         "chancel",
         "chantry",
         "chapel",
-        "church",
         "fold",
         "house of God",
         "house of prayer",
diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json
index 617323caa..4a031cc7e 100644
--- a/data/presets/presets/amenity/place_of_worship/jewish.json
+++ b/data/presets/presets/amenity/place_of_worship/jewish.json
@@ -7,12 +7,10 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "jewish",
-        "synagogue"
+        "jewish"
     ],
     "tags": {
         "amenity": "place_of_worship",
diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json
index 983159938..a677176e2 100644
--- a/data/presets/presets/amenity/place_of_worship/muslim.json
+++ b/data/presets/presets/amenity/place_of_worship/muslim.json
@@ -7,12 +7,10 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "muslim",
-        "mosque"
+        "muslim"
     ],
     "tags": {
         "amenity": "place_of_worship",
diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json
index e8acfda62..82a83b735 100644
--- a/data/presets/presets/amenity/police.json
+++ b/data/presets/presets/amenity/police.json
@@ -7,38 +7,19 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
         "badge",
-        "bear",
-        "blue",
-        "bluecoat",
-        "bobby",
-        "boy scout",
-        "bull",
         "constable",
         "constabulary",
         "cop",
-        "copper",
-        "corps",
-        "county mounty",
         "detective",
         "fed",
-        "flatfoot",
-        "force",
-        "fuzz",
-        "gendarme",
-        "gumshoe",
-        "heat",
         "law",
-        "law enforcement",
-        "man",
-        "narc",
-        "officers",
-        "patrolman",
-        "police"
+        "enforcement",
+        "officer",
+        "patrol"
     ],
     "tags": {
         "amenity": "police"
diff --git a/data/presets/presets/amenity/post_box.json b/data/presets/presets/amenity/post_box.json
index 0e7eecf2f..4e02514a4 100644
--- a/data/presets/presets/amenity/post_box.json
+++ b/data/presets/presets/amenity/post_box.json
@@ -12,12 +12,8 @@
         "amenity": "post_box"
     },
     "terms": [
-        "letter drop",
-        "letterbox",
-        "mail drop",
-        "mailbox",
-        "pillar box",
-        "postbox"
+        "letter",
+        "post"
     ],
     "name": "Mailbox"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/post_office.json b/data/presets/presets/amenity/post_office.json
index 14cd21851..0355b93ae 100644
--- a/data/presets/presets/amenity/post_office.json
+++ b/data/presets/presets/amenity/post_office.json
@@ -8,9 +8,12 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "letter",
+        "mail"
+    ],
     "tags": {
         "amenity": "post_office"
     },
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
index a3fbe88a2..90af85b79 100644
--- a/data/presets/presets/amenity/pub.json
+++ b/data/presets/presets/amenity/pub.json
@@ -8,12 +8,16 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "amenity": "pub"
     },
-    "terms": [],
+    "terms": [
+        "dive",
+        "beer",
+        "bier",
+        "booze"
+    ],
     "name": "Pub"
 }
diff --git a/data/presets/presets/amenity/recycling.json b/data/presets/presets/amenity/recycling.json
index 06210a3bf..f69730690 100644
--- a/data/presets/presets/amenity/recycling.json
+++ b/data/presets/presets/amenity/recycling.json
@@ -10,10 +10,15 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
-    "terms": [],
+    "terms": [
+        "can",
+        "bottle",
+        "garbage",
+        "scrap",
+        "trash"
+    ],
     "tags": {
         "amenity": "recycling"
     },
diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json
index 0764e26c3..e643665fb 100644
--- a/data/presets/presets/amenity/restaurant.json
+++ b/data/presets/presets/amenity/restaurant.json
@@ -10,42 +10,23 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
         "bar",
-        "cafeteria",
+        "breakfast",
+        "cafe",
         "café",
         "canteen",
-        "chophouse",
-        "coffee shop",
-        "diner",
-        "dining room",
-        "dive*",
-        "doughtnut shop",
+        "coffee",
+        "dine",
+        "dining",
+        "dinner",
         "drive-in",
-        "eatery",
-        "eating house",
-        "eating place",
-        "fast-food place",
-        "fish and chips",
-        "greasy spoon",
+        "eat",
         "grill",
-        "hamburger stand",
-        "hashery",
-        "hideaway",
-        "hotdog stand",
-        "inn",
-        "joint*",
-        "luncheonette",
-        "lunchroom",
-        "night club",
-        "outlet*",
-        "pizzeria",
-        "saloon",
-        "soda fountain",
-        "watering hole"
+        "lunch",
+        "table"
     ],
     "tags": {
         "amenity": "restaurant"
diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
index 15f89da2e..e3b1f38d3 100644
--- a/data/presets/presets/amenity/school.json
+++ b/data/presets/presets/amenity/school.json
@@ -10,7 +10,9 @@
     ],
     "terms": [
         "academy",
-        "school*"
+        "elementary school",
+        "middle school",
+        "high school"
     ],
     "tags": {
         "amenity": "school"
diff --git a/data/presets/presets/amenity/shelter.json b/data/presets/presets/amenity/shelter.json
index 44382fd62..58fe4f2ee 100644
--- a/data/presets/presets/amenity/shelter.json
+++ b/data/presets/presets/amenity/shelter.json
@@ -7,11 +7,13 @@
         "vertex",
         "area"
     ],
+    "terms": [
+        "lean-to",
+        "gazebo",
+        "picnic"
+    ],
     "tags": {
         "amenity": "shelter"
     },
-    "terms": [
-        "lean-to"
-    ],
     "name": "Shelter"
 }
diff --git a/data/presets/presets/amenity/social_facility/group_home.json b/data/presets/presets/amenity/social_facility/group_home.json
index 215192618..4bb14e9aa 100644
--- a/data/presets/presets/amenity/social_facility/group_home.json
+++ b/data/presets/presets/amenity/social_facility/group_home.json
@@ -12,9 +12,9 @@
         "area"
     ],
     "terms": [
-        "elderly",
         "old",
-        "senior living"
+        "senior",
+        "living"
     ],
     "tags": {
         "amenity": "social_facility",
diff --git a/data/presets/presets/amenity/studio.json b/data/presets/presets/amenity/studio.json
index fb1a0f7d2..987745aca 100644
--- a/data/presets/presets/amenity/studio.json
+++ b/data/presets/presets/amenity/studio.json
@@ -10,12 +10,9 @@
         "area"
     ],
     "terms": [
-        "recording studio",
-        "studio",
+        "recording",
         "radio",
-        "radio studio",
-        "television",
-        "television studio"
+        "television"
     ],
     "tags": {
         "amenity": "studio"
diff --git a/data/presets/presets/amenity/swimming_pool.json b/data/presets/presets/amenity/swimming_pool.json
index 0b8bcbaed..1f4c01cbb 100644
--- a/data/presets/presets/amenity/swimming_pool.json
+++ b/data/presets/presets/amenity/swimming_pool.json
@@ -8,6 +8,6 @@
     "tags": {
         "amenity": "swimming_pool"
     },
-    "searchable": false,
-    "name": "Swimming Pool"
+    "name": "Swimming Pool",
+    "searchable": false
 }
diff --git a/data/presets/presets/amenity/taxi.json b/data/presets/presets/amenity/taxi.json
index ceb10a819..780c835cc 100644
--- a/data/presets/presets/amenity/taxi.json
+++ b/data/presets/presets/amenity/taxi.json
@@ -1,4 +1,5 @@
 {
+    "icon": "car",
     "fields": [
         "operator",
         "capacity"
diff --git a/data/presets/presets/amenity/theatre.json b/data/presets/presets/amenity/theatre.json
index 84026882d..8d1773f38 100644
--- a/data/presets/presets/amenity/theatre.json
+++ b/data/presets/presets/amenity/theatre.json
@@ -7,7 +7,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
index 033b9e9f8..756bd8a85 100644
--- a/data/presets/presets/amenity/toilets.json
+++ b/data/presets/presets/amenity/toilets.json
@@ -1,4 +1,5 @@
 {
+    "icon": "toilets",
     "fields": [
         "toilets/disposal",
         "operator",
@@ -25,6 +26,5 @@
     "tags": {
         "amenity": "toilets"
     },
-    "icon": "toilets",
     "name": "Toilets"
 }
diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json
index 79b011150..de4cbd2e5 100644
--- a/data/presets/presets/amenity/townhall.json
+++ b/data/presets/presets/amenity/townhall.json
@@ -1,21 +1,20 @@
 {
     "icon": "town-hall",
     "fields": [
+        "operator",
         "address",
         "building_area"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "village hall",
-        "city government",
+        "village",
+        "city",
+        "government",
         "courthouse",
-        "municipal building",
-        "municipal center",
-        "municipal centre"
+        "municipal"
     ],
     "tags": {
         "amenity": "townhall"
diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json
index e06eb9905..f99085a21 100644
--- a/data/presets/presets/amenity/university.json
+++ b/data/presets/presets/amenity/university.json
@@ -9,8 +9,7 @@
         "area"
     ],
     "terms": [
-        "college",
-        "university"
+        "college"
     ],
     "tags": {
         "amenity": "university"
diff --git a/data/presets/presets/amenity/vending_machine.json b/data/presets/presets/amenity/vending_machine.json
index 2a0098527..299b06710 100644
--- a/data/presets/presets/amenity/vending_machine.json
+++ b/data/presets/presets/amenity/vending_machine.json
@@ -6,6 +6,11 @@
     "geometry": [
         "point"
     ],
+    "terms": [
+        "snack",
+        "soda",
+        "ticket"
+    ],
     "tags": {
         "amenity": "vending_machine"
     },
diff --git a/data/presets/presets/amenity/veterinary.json b/data/presets/presets/amenity/veterinary.json
index de929800e..082505c54 100644
--- a/data/presets/presets/amenity/veterinary.json
+++ b/data/presets/presets/amenity/veterinary.json
@@ -1,6 +1,7 @@
 {
     "icon": "dog-park",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/amenity/waste_basket.json b/data/presets/presets/amenity/waste_basket.json
index b16aeb9ce..a98fb15f2 100644
--- a/data/presets/presets/amenity/waste_basket.json
+++ b/data/presets/presets/amenity/waste_basket.json
@@ -8,10 +8,10 @@
         "amenity": "waste_basket"
     },
     "terms": [
-        "rubbish bin",
-        "litter bin",
-        "trash can",
-        "garbage can"
+        "rubbish",
+        "litter",
+        "trash",
+        "garbage"
     ],
     "name": "Waste Basket"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/building/apartments.json b/data/presets/presets/building/apartments.json
index ad8eabe1f..a08ad5ca7 100644
--- a/data/presets/presets/building/apartments.json
+++ b/data/presets/presets/building/apartments.json
@@ -6,11 +6,10 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "building": "apartments"
     },
     "name": "Apartments"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/building/barn.json b/data/presets/presets/building/barn.json
index 7c44aa7d3..8ca6ba5dd 100644
--- a/data/presets/presets/building/barn.json
+++ b/data/presets/presets/building/barn.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/bunker.json b/data/presets/presets/building/bunker.json
index 004e8d004..7cddea7ba 100644
--- a/data/presets/presets/building/bunker.json
+++ b/data/presets/presets/building/bunker.json
@@ -5,7 +5,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/cabin.json b/data/presets/presets/building/cabin.json
index c65d99511..eeb89a279 100644
--- a/data/presets/presets/building/cabin.json
+++ b/data/presets/presets/building/cabin.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/cathedral.json b/data/presets/presets/building/cathedral.json
index 32c86aafa..130df7a40 100644
--- a/data/presets/presets/building/cathedral.json
+++ b/data/presets/presets/building/cathedral.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/chapel.json b/data/presets/presets/building/chapel.json
index 225e19e14..d403a6838 100644
--- a/data/presets/presets/building/chapel.json
+++ b/data/presets/presets/building/chapel.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/church.json b/data/presets/presets/building/church.json
index 9e12cca97..3c786b694 100644
--- a/data/presets/presets/building/church.json
+++ b/data/presets/presets/building/church.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/college.json b/data/presets/presets/building/college.json
index e3d776fc2..67836d615 100644
--- a/data/presets/presets/building/college.json
+++ b/data/presets/presets/building/college.json
@@ -6,11 +6,9 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "college",
         "university"
     ],
     "tags": {
diff --git a/data/presets/presets/building/commercial.json b/data/presets/presets/building/commercial.json
index 27c035de4..ced3c7a50 100644
--- a/data/presets/presets/building/commercial.json
+++ b/data/presets/presets/building/commercial.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/construction.json b/data/presets/presets/building/construction.json
index 4b3add1d6..cc21c71fd 100644
--- a/data/presets/presets/building/construction.json
+++ b/data/presets/presets/building/construction.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/detached.json b/data/presets/presets/building/detached.json
index 31bdc9217..39c7b6105 100644
--- a/data/presets/presets/building/detached.json
+++ b/data/presets/presets/building/detached.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/dormitory.json b/data/presets/presets/building/dormitory.json
index f4dc8d32d..fe5528250 100644
--- a/data/presets/presets/building/dormitory.json
+++ b/data/presets/presets/building/dormitory.json
@@ -7,7 +7,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/garage.json b/data/presets/presets/building/garage.json
index b1820b2ee..41aa55a01 100644
--- a/data/presets/presets/building/garage.json
+++ b/data/presets/presets/building/garage.json
@@ -4,7 +4,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
@@ -12,4 +11,4 @@
     },
     "name": "Garage",
     "icon": "warehouse"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/building/garages.json b/data/presets/presets/building/garages.json
index cc165be3b..a25331ac9 100644
--- a/data/presets/presets/building/garages.json
+++ b/data/presets/presets/building/garages.json
@@ -5,7 +5,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/greenhouse.json b/data/presets/presets/building/greenhouse.json
index 906f7bac8..5c1dedc00 100644
--- a/data/presets/presets/building/greenhouse.json
+++ b/data/presets/presets/building/greenhouse.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/hospital.json b/data/presets/presets/building/hospital.json
index aaec7013c..d4ae10cdc 100644
--- a/data/presets/presets/building/hospital.json
+++ b/data/presets/presets/building/hospital.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/hotel.json b/data/presets/presets/building/hotel.json
index e192a3ce7..d162e754a 100644
--- a/data/presets/presets/building/hotel.json
+++ b/data/presets/presets/building/hotel.json
@@ -7,7 +7,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/hut.json b/data/presets/presets/building/hut.json
index 2c665c23a..8e9c886a1 100644
--- a/data/presets/presets/building/hut.json
+++ b/data/presets/presets/building/hut.json
@@ -1,11 +1,10 @@
 {
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "building": "hut"
     },
     "name": "Hut"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/building/industrial.json b/data/presets/presets/building/industrial.json
index c24aede85..b811d102a 100644
--- a/data/presets/presets/building/industrial.json
+++ b/data/presets/presets/building/industrial.json
@@ -6,11 +6,10 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "building": "industrial"
     },
     "name": "Industrial Building"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/building/kindergarten.json b/data/presets/presets/building/kindergarten.json
index 850e478a7..ec4fab7ab 100644
--- a/data/presets/presets/building/kindergarten.json
+++ b/data/presets/presets/building/kindergarten.json
@@ -6,13 +6,11 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "kindergarten",
         "kindergarden",
-        "preschool"
+        "pre-school"
     ],
     "tags": {
         "building": "kindergarten"
diff --git a/data/presets/presets/building/public.json b/data/presets/presets/building/public.json
index 8cc37e20f..75798fc2e 100644
--- a/data/presets/presets/building/public.json
+++ b/data/presets/presets/building/public.json
@@ -7,7 +7,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/residential.json b/data/presets/presets/building/residential.json
index 28b820251..116f1eeb1 100644
--- a/data/presets/presets/building/residential.json
+++ b/data/presets/presets/building/residential.json
@@ -6,11 +6,10 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "building": "residential"
     },
     "name": "Residential Building"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/building/retail.json b/data/presets/presets/building/retail.json
index 2deef24ed..d4eaddef2 100644
--- a/data/presets/presets/building/retail.json
+++ b/data/presets/presets/building/retail.json
@@ -7,7 +7,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/roof.json b/data/presets/presets/building/roof.json
index 74216e282..802f90e8c 100644
--- a/data/presets/presets/building/roof.json
+++ b/data/presets/presets/building/roof.json
@@ -1,12 +1,10 @@
 {
     "icon": "building",
     "fields": [
-        "address",
-        "levels"
+        "address"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/school.json b/data/presets/presets/building/school.json
index 0d7078c98..2f9f5061d 100644
--- a/data/presets/presets/building/school.json
+++ b/data/presets/presets/building/school.json
@@ -6,12 +6,13 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
         "academy",
-        "school*"
+        "elementary school",
+        "middle school",
+        "high school"
     ],
     "tags": {
         "building": "school"
diff --git a/data/presets/presets/building/shed.json b/data/presets/presets/building/shed.json
index 9f8e7c0d2..d9b58d192 100644
--- a/data/presets/presets/building/shed.json
+++ b/data/presets/presets/building/shed.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/stable.json b/data/presets/presets/building/stable.json
index 71799ed4b..12d8262d1 100644
--- a/data/presets/presets/building/stable.json
+++ b/data/presets/presets/building/stable.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/static_caravan.json b/data/presets/presets/building/static_caravan.json
index 7d6a9f97c..626e6341b 100644
--- a/data/presets/presets/building/static_caravan.json
+++ b/data/presets/presets/building/static_caravan.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/terrace.json b/data/presets/presets/building/terrace.json
index a2e01ff9a..22782a3dd 100644
--- a/data/presets/presets/building/terrace.json
+++ b/data/presets/presets/building/terrace.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/building/university.json b/data/presets/presets/building/university.json
index cbdd28659..ace9d0014 100644
--- a/data/presets/presets/building/university.json
+++ b/data/presets/presets/building/university.json
@@ -6,12 +6,10 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "college",
-        "university"
+        "college"
     ],
     "tags": {
         "building": "university"
diff --git a/data/presets/presets/building/warehouse.json b/data/presets/presets/building/warehouse.json
index 6df18ca73..96f68cf4d 100644
--- a/data/presets/presets/building/warehouse.json
+++ b/data/presets/presets/building/warehouse.json
@@ -6,7 +6,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/craft.json b/data/presets/presets/craft.json
new file mode 100644
index 000000000..b75ee3ebc
--- /dev/null
+++ b/data/presets/presets/craft.json
@@ -0,0 +1,19 @@
+{
+    "icon": "marker-stroked",
+    "fields": [
+        "craft",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "craft": "*"
+    },
+    "terms": [],
+    "name": "Craft"
+}
diff --git a/data/presets/presets/craft/basket_maker.json b/data/presets/presets/craft/basket_maker.json
index 78f90b57f..537c1526e 100644
--- a/data/presets/presets/craft/basket_maker.json
+++ b/data/presets/presets/craft/basket_maker.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "basket*"
-    ],
     "tags": {
         "craft": "basket_maker"
     },
diff --git a/data/presets/presets/craft/beekeeper.json b/data/presets/presets/craft/beekeeper.json
index 26bc85b2d..8e300a28b 100644
--- a/data/presets/presets/craft/beekeeper.json
+++ b/data/presets/presets/craft/beekeeper.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "bee*"
-    ],
     "tags": {
         "craft": "beekeeper"
     },
diff --git a/data/presets/presets/craft/blacksmith.json b/data/presets/presets/craft/blacksmith.json
index d36f52fdc..a2dfedd13 100644
--- a/data/presets/presets/craft/blacksmith.json
+++ b/data/presets/presets/craft/blacksmith.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "blacksmith"
-    ],
     "tags": {
         "craft": "blacksmith"
     },
diff --git a/data/presets/presets/craft/boatbuilder.json b/data/presets/presets/craft/boatbuilder.json
index 80ef133b1..0f246d187 100644
--- a/data/presets/presets/craft/boatbuilder.json
+++ b/data/presets/presets/craft/boatbuilder.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "boat builder"
-    ],
     "tags": {
         "craft": "boatbuilder"
     },
diff --git a/data/presets/presets/craft/bookbinder.json b/data/presets/presets/craft/bookbinder.json
index deb1b11e7..0bf51a2ef 100644
--- a/data/presets/presets/craft/bookbinder.json
+++ b/data/presets/presets/craft/bookbinder.json
@@ -11,7 +11,6 @@
         "area"
     ],
     "terms": [
-        "bookbinder",
         "book repair"
     ],
     "tags": {
diff --git a/data/presets/presets/craft/brewery.json b/data/presets/presets/craft/brewery.json
index 7d81b5682..8450f8c4d 100644
--- a/data/presets/presets/craft/brewery.json
+++ b/data/presets/presets/craft/brewery.json
@@ -11,7 +11,8 @@
         "area"
     ],
     "terms": [
-        "brewery"
+        "beer",
+        "bier"
     ],
     "tags": {
         "craft": "brewery"
diff --git a/data/presets/presets/craft/carpenter.json b/data/presets/presets/craft/carpenter.json
index d0f994bcb..570ecd67b 100644
--- a/data/presets/presets/craft/carpenter.json
+++ b/data/presets/presets/craft/carpenter.json
@@ -11,7 +11,6 @@
         "area"
     ],
     "terms": [
-        "carpenter",
         "woodworker"
     ],
     "tags": {
diff --git a/data/presets/presets/craft/carpet_layer.json b/data/presets/presets/craft/carpet_layer.json
index dbaf45d46..f7f7bab2f 100644
--- a/data/presets/presets/craft/carpet_layer.json
+++ b/data/presets/presets/craft/carpet_layer.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "carpet layer"
-    ],
     "tags": {
         "craft": "carpet_layer"
     },
diff --git a/data/presets/presets/craft/caterer.json b/data/presets/presets/craft/caterer.json
index 56de72b27..0f86cc677 100644
--- a/data/presets/presets/craft/caterer.json
+++ b/data/presets/presets/craft/caterer.json
@@ -11,9 +11,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "cater*"
-    ],
     "tags": {
         "craft": "caterer"
     },
diff --git a/data/presets/presets/craft/clockmaker.json b/data/presets/presets/craft/clockmaker.json
index 2c9524737..f9fb3ce43 100644
--- a/data/presets/presets/craft/clockmaker.json
+++ b/data/presets/presets/craft/clockmaker.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "clock*"
-    ],
     "tags": {
         "craft": "clockmaker"
     },
diff --git a/data/presets/presets/craft/confectionary.json b/data/presets/presets/craft/confectionary.json
index f15e4c5c9..2b604b969 100644
--- a/data/presets/presets/craft/confectionary.json
+++ b/data/presets/presets/craft/confectionary.json
@@ -11,7 +11,6 @@
         "area"
     ],
     "terms": [
-        "confectionary",
         "sweets",
         "candy"
     ],
diff --git a/data/presets/presets/craft/dressmaker.json b/data/presets/presets/craft/dressmaker.json
index 7c9a1322c..b1bcd6ae2 100644
--- a/data/presets/presets/craft/dressmaker.json
+++ b/data/presets/presets/craft/dressmaker.json
@@ -11,8 +11,7 @@
         "area"
     ],
     "terms": [
-        "dress",
-        "dressmaker"
+        "seamstress"
     ],
     "tags": {
         "craft": "dressmaker"
diff --git a/data/presets/presets/craft/electrician.json b/data/presets/presets/craft/electrician.json
index d16986210..961686e45 100644
--- a/data/presets/presets/craft/electrician.json
+++ b/data/presets/presets/craft/electrician.json
@@ -11,7 +11,8 @@
         "area"
     ],
     "terms": [
-        "electrician"
+        "power",
+        "wire"
     ],
     "tags": {
         "craft": "electrician"
diff --git a/data/presets/presets/craft/gardener.json b/data/presets/presets/craft/gardener.json
index 58ce4762e..b3b56e7cf 100644
--- a/data/presets/presets/craft/gardener.json
+++ b/data/presets/presets/craft/gardener.json
@@ -11,7 +11,6 @@
         "area"
     ],
     "terms": [
-        "gardener",
         "landscaper",
         "grounds keeper"
     ],
diff --git a/data/presets/presets/craft/glaziery.json b/data/presets/presets/craft/glaziery.json
index ff413b681..00071c201 100644
--- a/data/presets/presets/craft/glaziery.json
+++ b/data/presets/presets/craft/glaziery.json
@@ -12,7 +12,6 @@
     ],
     "terms": [
         "glass",
-        "glass foundry",
         "stained-glass",
         "window"
     ],
diff --git a/data/presets/presets/craft/handicraft.json b/data/presets/presets/craft/handicraft.json
index bcb9833ea..9766bcf77 100644
--- a/data/presets/presets/craft/handicraft.json
+++ b/data/presets/presets/craft/handicraft.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "handicraft"
-    ],
     "tags": {
         "craft": "handicraft"
     },
diff --git a/data/presets/presets/craft/hvac.json b/data/presets/presets/craft/hvac.json
index a36540cb2..62a87ec2c 100644
--- a/data/presets/presets/craft/hvac.json
+++ b/data/presets/presets/craft/hvac.json
@@ -13,7 +13,6 @@
     "terms": [
         "heat*",
         "vent*",
-        "air-conditioning",
         "air conditioning"
     ],
     "tags": {
diff --git a/data/presets/presets/craft/insulator.json b/data/presets/presets/craft/insulator.json
index 38dcf89dc..fd6ad73f3 100644
--- a/data/presets/presets/craft/insulator.json
+++ b/data/presets/presets/craft/insulator.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "insulat*"
-    ],
     "tags": {
         "craft": "insulation"
     },
diff --git a/data/presets/presets/craft/jeweler.json b/data/presets/presets/craft/jeweler.json
index 1f795d88f..95db51ca6 100644
--- a/data/presets/presets/craft/jeweler.json
+++ b/data/presets/presets/craft/jeweler.json
@@ -10,11 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "jeweler",
-        "gem",
-        "diamond"
-    ],
     "tags": {
         "craft": "jeweler"
     },
diff --git a/data/presets/presets/craft/key_cutter.json b/data/presets/presets/craft/key_cutter.json
index 3e667d2ac..ba04dd5f3 100644
--- a/data/presets/presets/craft/key_cutter.json
+++ b/data/presets/presets/craft/key_cutter.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "key*"
-    ],
     "tags": {
         "craft": "key_cutter"
     },
diff --git a/data/presets/presets/craft/locksmith.json b/data/presets/presets/craft/locksmith.json
index 6ee6c84a8..8a8a05a0c 100644
--- a/data/presets/presets/craft/locksmith.json
+++ b/data/presets/presets/craft/locksmith.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "lock*"
-    ],
     "tags": {
         "craft": "locksmith"
     },
diff --git a/data/presets/presets/craft/metal_construction.json b/data/presets/presets/craft/metal_construction.json
index 6c533304c..190173b2d 100644
--- a/data/presets/presets/craft/metal_construction.json
+++ b/data/presets/presets/craft/metal_construction.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "metal construction"
-    ],
     "tags": {
         "craft": "metal_construction"
     },
diff --git a/data/presets/presets/craft/optician.json b/data/presets/presets/craft/optician.json
index 2772c512a..257cce2d8 100644
--- a/data/presets/presets/craft/optician.json
+++ b/data/presets/presets/craft/optician.json
@@ -10,10 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "glasses",
-        "optician"
-    ],
     "tags": {
         "craft": "optician"
     },
diff --git a/data/presets/presets/craft/painter.json b/data/presets/presets/craft/painter.json
index f69a16bb8..3c5759930 100644
--- a/data/presets/presets/craft/painter.json
+++ b/data/presets/presets/craft/painter.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "painter"
-    ],
     "tags": {
         "craft": "painter"
     },
diff --git a/data/presets/presets/craft/photographer.json b/data/presets/presets/craft/photographer.json
index 453feca9e..f9600d258 100644
--- a/data/presets/presets/craft/photographer.json
+++ b/data/presets/presets/craft/photographer.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "photographer"
-    ],
     "tags": {
         "craft": "photographer"
     },
diff --git a/data/presets/presets/craft/photographic_laboratory.json b/data/presets/presets/craft/photographic_laboratory.json
index 58842e495..e6ebbe905 100644
--- a/data/presets/presets/craft/photographic_laboratory.json
+++ b/data/presets/presets/craft/photographic_laboratory.json
@@ -11,7 +11,6 @@
         "area"
     ],
     "terms": [
-        "photo*",
         "film"
     ],
     "tags": {
diff --git a/data/presets/presets/craft/plasterer.json b/data/presets/presets/craft/plasterer.json
index ea1625897..9c2a437f2 100644
--- a/data/presets/presets/craft/plasterer.json
+++ b/data/presets/presets/craft/plasterer.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "plasterer"
-    ],
     "tags": {
         "craft": "plasterer"
     },
diff --git a/data/presets/presets/craft/plumber.json b/data/presets/presets/craft/plumber.json
index d7bcfe3d2..4a18b28fe 100644
--- a/data/presets/presets/craft/plumber.json
+++ b/data/presets/presets/craft/plumber.json
@@ -11,7 +11,7 @@
         "area"
     ],
     "terms": [
-        "pumber"
+        "pipe"
     ],
     "tags": {
         "craft": "plumber"
diff --git a/data/presets/presets/craft/pottery.json b/data/presets/presets/craft/pottery.json
index f07b6ae56..203705f20 100644
--- a/data/presets/presets/craft/pottery.json
+++ b/data/presets/presets/craft/pottery.json
@@ -11,8 +11,7 @@
         "area"
     ],
     "terms": [
-        "potter*",
-        "ceramic*"
+        "ceramic"
     ],
     "tags": {
         "craft": "pottery"
diff --git a/data/presets/presets/craft/rigger.json b/data/presets/presets/craft/rigger.json
index 06bac0171..4aab146a8 100644
--- a/data/presets/presets/craft/rigger.json
+++ b/data/presets/presets/craft/rigger.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "rigger"
-    ],
     "tags": {
         "craft": "rigger"
     },
diff --git a/data/presets/presets/craft/roofer.json b/data/presets/presets/craft/roofer.json
index c656e055a..fbb6489ee 100644
--- a/data/presets/presets/craft/roofer.json
+++ b/data/presets/presets/craft/roofer.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "roofer"
-    ],
     "tags": {
         "craft": "roofer"
     },
diff --git a/data/presets/presets/craft/saddler.json b/data/presets/presets/craft/saddler.json
index e3e23da7d..7d9997665 100644
--- a/data/presets/presets/craft/saddler.json
+++ b/data/presets/presets/craft/saddler.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "saddle*"
-    ],
     "tags": {
         "craft": "saddler"
     },
diff --git a/data/presets/presets/craft/sailmaker.json b/data/presets/presets/craft/sailmaker.json
index 3b882bb90..bffd63633 100644
--- a/data/presets/presets/craft/sailmaker.json
+++ b/data/presets/presets/craft/sailmaker.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "sail*"
-    ],
     "tags": {
         "craft": "sailmaker"
     },
diff --git a/data/presets/presets/craft/sawmill.json b/data/presets/presets/craft/sawmill.json
index 90f7b1577..a2da42fb0 100644
--- a/data/presets/presets/craft/sawmill.json
+++ b/data/presets/presets/craft/sawmill.json
@@ -11,7 +11,6 @@
         "area"
     ],
     "terms": [
-        "sawmill",
         "lumber"
     ],
     "tags": {
diff --git a/data/presets/presets/craft/scaffolder.json b/data/presets/presets/craft/scaffolder.json
index e66fe4ff0..5f6305af0 100644
--- a/data/presets/presets/craft/scaffolder.json
+++ b/data/presets/presets/craft/scaffolder.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "scaffolder"
-    ],
     "tags": {
         "craft": "scaffolder"
     },
diff --git a/data/presets/presets/craft/sculpter.json b/data/presets/presets/craft/sculpter.json
index 1268ea1ae..e0d1f0976 100644
--- a/data/presets/presets/craft/sculpter.json
+++ b/data/presets/presets/craft/sculpter.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "sculpter"
-    ],
     "tags": {
         "craft": "sculpter"
     },
diff --git a/data/presets/presets/craft/shoemaker.json b/data/presets/presets/craft/shoemaker.json
index 8fe198efb..abf7c5050 100644
--- a/data/presets/presets/craft/shoemaker.json
+++ b/data/presets/presets/craft/shoemaker.json
@@ -11,8 +11,7 @@
         "area"
     ],
     "terms": [
-        "shoe repair",
-        "shoemaker"
+        "cobbler"
     ],
     "tags": {
         "craft": "shoemaker"
diff --git a/data/presets/presets/craft/stonemason.json b/data/presets/presets/craft/stonemason.json
index c57bc6a9b..8253c16cf 100644
--- a/data/presets/presets/craft/stonemason.json
+++ b/data/presets/presets/craft/stonemason.json
@@ -11,7 +11,6 @@
         "area"
     ],
     "terms": [
-        "stonemason",
         "masonry"
     ],
     "tags": {
diff --git a/data/presets/presets/craft/sweep.json b/data/presets/presets/craft/sweep.json
index f683739dc..61582a9e0 100644
--- a/data/presets/presets/craft/sweep.json
+++ b/data/presets/presets/craft/sweep.json
@@ -10,10 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "sweep",
-        "chimney"
-    ],
     "tags": {
         "craft": "sweep"
     },
diff --git a/data/presets/presets/craft/tailor.json b/data/presets/presets/craft/tailor.json
index 8898c6bcf..6e365eb0c 100644
--- a/data/presets/presets/craft/tailor.json
+++ b/data/presets/presets/craft/tailor.json
@@ -11,11 +11,12 @@
         "area"
     ],
     "terms": [
-        "tailor",
-        "clothes"
+        "clothes",
+        "suit"
     ],
     "tags": {
         "craft": "tailor"
     },
-    "name": "Tailor"
+    "name": "Tailor",
+    "searchable": false
 }
diff --git a/data/presets/presets/craft/tiler.json b/data/presets/presets/craft/tiler.json
index 02fcfce57..4fd90825a 100644
--- a/data/presets/presets/craft/tiler.json
+++ b/data/presets/presets/craft/tiler.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "tiler"
-    ],
     "tags": {
         "craft": "tiler"
     },
diff --git a/data/presets/presets/craft/tinsmith.json b/data/presets/presets/craft/tinsmith.json
index 3068a1cce..689515b6e 100644
--- a/data/presets/presets/craft/tinsmith.json
+++ b/data/presets/presets/craft/tinsmith.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "tinsmith"
-    ],
     "tags": {
         "craft": "tinsmith"
     },
diff --git a/data/presets/presets/craft/upholsterer.json b/data/presets/presets/craft/upholsterer.json
index 1d0a65913..575407047 100644
--- a/data/presets/presets/craft/upholsterer.json
+++ b/data/presets/presets/craft/upholsterer.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "upholsterer"
-    ],
     "tags": {
         "craft": "upholsterer"
     },
diff --git a/data/presets/presets/craft/watchmaker.json b/data/presets/presets/craft/watchmaker.json
index 0cd6a58ad..8985c5995 100644
--- a/data/presets/presets/craft/watchmaker.json
+++ b/data/presets/presets/craft/watchmaker.json
@@ -10,9 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-        "watch*"
-    ],
     "tags": {
         "craft": "watchmaker"
     },
diff --git a/data/presets/presets/craft/window_construction.json b/data/presets/presets/craft/window_construction.json
index 393ceedc8..832b77dc6 100644
--- a/data/presets/presets/craft/window_construction.json
+++ b/data/presets/presets/craft/window_construction.json
@@ -11,7 +11,7 @@
         "area"
     ],
     "terms": [
-        "window*"
+        "glass"
     ],
     "tags": {
         "craft": "window_construction"
diff --git a/data/presets/presets/craft/winery.json b/data/presets/presets/craft/winery.json
new file mode 100644
index 000000000..e00ee7e14
--- /dev/null
+++ b/data/presets/presets/craft/winery.json
@@ -0,0 +1,17 @@
+{
+    "icon": "alcohol-shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "craft": "winery"
+    },
+    "name": "Winery"
+}
diff --git a/data/presets/presets/emergency/ambulance_station.json b/data/presets/presets/emergency/ambulance_station.json
index 68e0d2558..db39e6e21 100644
--- a/data/presets/presets/emergency/ambulance_station.json
+++ b/data/presets/presets/emergency/ambulance_station.json
@@ -6,9 +6,13 @@
         "address"
     ],
     "geometry": [
-        "area",
         "point",
-        "vertex"
+        "area"
+    ],
+    "terms": [
+        "EMS",
+        "EMT",
+        "rescue"
     ],
     "tags": {
         "emergency": "ambulance_station"
diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/footway/crosswalk.json
index f41afe3b6..6ab330cb0 100644
--- a/data/presets/presets/footway/crosswalk.json
+++ b/data/presets/presets/footway/crosswalk.json
@@ -15,7 +15,6 @@
         "crossing": "zebra"
     },
     "terms": [
-        "crosswalk",
         "zebra crossing"
     ],
     "name": "Crosswalk"
diff --git a/data/presets/presets/golf/green.json b/data/presets/presets/golf/green.json
index 38b99ba3b..057bcb897 100644
--- a/data/presets/presets/golf/green.json
+++ b/data/presets/presets/golf/green.json
@@ -9,8 +9,5 @@
         "leisure": "pitch",
         "sport": "golf"
     },
-    "terms": [
-        "putting green"
-    ],
     "name": "Putting Green"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/highway/bridleway.json b/data/presets/presets/highway/bridleway.json
index 8b6edf2e3..f37224c38 100644
--- a/data/presets/presets/highway/bridleway.json
+++ b/data/presets/presets/highway/bridleway.json
@@ -14,10 +14,8 @@
     },
     "terms": [
         "bridleway",
-        "equestrian trail",
-        "horse riding path",
-        "bridle road",
-        "horse trail"
+        "equestrian",
+        "horse"
     ],
     "name": "Bridle Path"
 }
diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crosswalk.json
index 875c48fe6..2ac45ff82 100644
--- a/data/presets/presets/highway/crosswalk.json
+++ b/data/presets/presets/highway/crosswalk.json
@@ -12,7 +12,6 @@
         "crossing": "zebra"
     },
     "terms": [
-        "crosswalk",
         "zebra crossing"
     ],
     "name": "Crosswalk"
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
index f6cc564d0..345c084c5 100644
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -14,6 +14,8 @@
     "tags": {
         "highway": "cycleway"
     },
-    "terms": [],
+    "terms": [
+        "bike"
+    ],
     "name": "Cycle Path"
 }
diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json
index 196be7e2f..9883a4560 100644
--- a/data/presets/presets/highway/footway.json
+++ b/data/presets/presets/highway/footway.json
@@ -11,29 +11,10 @@
         "line", "area"
     ],
     "terms": [
-        "beaten path",
-        "boulevard",
-        "clearing",
-        "course",
-        "cut*",
-        "drag*",
-        "footpath",
-        "highway",
-        "lane",
-        "line",
-        "orbit",
-        "passage",
-        "pathway",
-        "rail",
-        "rails",
-        "road",
-        "roadway",
-        "route",
-        "street",
-        "thoroughfare",
+        "hike",
+        "hiking",
         "trackway",
         "trail",
-        "trajectory",
         "walk"
     ],
     "tags": {
diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json
index 3746e5be4..a38306333 100644
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -16,9 +16,15 @@
     "geometry": [
         "line"
     ],
+    "terms": [
+        "hike",
+        "hiking",
+        "trackway",
+        "trail",
+        "walk"
+    ],
     "tags": {
         "highway": "path"
     },
-    "terms": [],
     "name": "Path"
 }
diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json
index cff0de7fd..aeb87dd2c 100644
--- a/data/presets/presets/highway/primary_link.json
+++ b/data/presets/presets/highway/primary_link.json
@@ -14,6 +14,10 @@
     "tags": {
         "highway": "primary_link"
     },
-    "terms": ["ramp", "on ramp", "off ramp"],
+    "terms": [
+        "ramp",
+        "on ramp",
+        "off ramp"
+    ],
     "name": "Primary Link"
 }
diff --git a/data/presets/presets/highway/rest_area.json b/data/presets/presets/highway/rest_area.json
index 5d000ddb2..5ce9e4c91 100644
--- a/data/presets/presets/highway/rest_area.json
+++ b/data/presets/presets/highway/rest_area.json
@@ -8,9 +8,7 @@
         "highway": "rest_area"
     },
     "terms": [
-        "rest stop",
-        "turnout",
-        "lay-by"
+        "rest stop"
     ],
     "name": "Rest Area"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json
index 56fcff64f..ce24d2d3a 100644
--- a/data/presets/presets/highway/secondary_link.json
+++ b/data/presets/presets/highway/secondary_link.json
@@ -14,6 +14,10 @@
     "tags": {
         "highway": "secondary_link"
     },
-    "terms": ["ramp", "on ramp", "off ramp"],
+    "terms": [
+        "ramp",
+        "on ramp",
+        "off ramp"
+    ],
     "name": "Secondary Link"
 }
diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json
index 72cc6d9fa..4f2398285 100644
--- a/data/presets/presets/highway/tertiary_link.json
+++ b/data/presets/presets/highway/tertiary_link.json
@@ -14,6 +14,10 @@
     "tags": {
         "highway": "tertiary_link"
     },
-    "terms": ["ramp", "on ramp", "off ramp"],
+    "terms": [
+        "ramp",
+        "on ramp",
+        "off ramp"
+    ],
     "name": "Tertiary Link"
 }
diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json
index bc6024626..951e3c741 100644
--- a/data/presets/presets/highway/track.json
+++ b/data/presets/presets/highway/track.json
@@ -18,6 +18,9 @@
     "tags": {
         "highway": "track"
     },
-    "terms": [],
+    "terms": [
+        "woods road",
+        "fire road"
+    ],
     "name": "Track"
 }
diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json
index 2993c7c48..37b934151 100644
--- a/data/presets/presets/highway/trunk_link.json
+++ b/data/presets/presets/highway/trunk_link.json
@@ -14,6 +14,10 @@
     "tags": {
         "highway": "trunk_link"
     },
-    "terms": ["ramp", "on ramp", "off ramp"],
+    "terms": [
+        "ramp",
+        "on ramp",
+        "off ramp"
+    ],
     "name": "Trunk Link"
 }
diff --git a/data/presets/presets/highway/turning_circle.json b/data/presets/presets/highway/turning_circle.json
index 18901a1a3..e0a50e4d0 100644
--- a/data/presets/presets/highway/turning_circle.json
+++ b/data/presets/presets/highway/turning_circle.json
@@ -6,6 +6,8 @@
     "tags": {
         "highway": "turning_circle"
     },
-    "terms": [],
+    "terms": [
+        "cul-de-sac"
+    ],
     "name": "Turning Circle"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/historic/castle.json b/data/presets/presets/historic/castle.json
index b4ad7e807..fed1adb06 100644
--- a/data/presets/presets/historic/castle.json
+++ b/data/presets/presets/historic/castle.json
@@ -1,11 +1,10 @@
 {
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "historic": "castle"
     },
     "name": "Castle"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json
index e13d3c287..9d4e284fb 100644
--- a/data/presets/presets/leisure/marina.json
+++ b/data/presets/presets/leisure/marina.json
@@ -5,6 +5,9 @@
         "vertex",
         "area"
     ],
+    "terms": [
+        "boat"
+    ],
     "tags": {
         "leisure": "marina"
     },
diff --git a/data/presets/presets/leisure/picnic_table.json b/data/presets/presets/leisure/picnic_table.json
index 41cb49a87..f24643f9d 100644
--- a/data/presets/presets/leisure/picnic_table.json
+++ b/data/presets/presets/leisure/picnic_table.json
@@ -6,8 +6,7 @@
         "leisure": "picnic_table"
     },
     "terms": [
-        "bench",
-        "table"
+        "bench"
     ],
     "name": "Picnic Table"
 }
diff --git a/data/presets/presets/leisure/pitch.json b/data/presets/presets/leisure/pitch.json
index 4958fd951..09e2c238e 100644
--- a/data/presets/presets/leisure/pitch.json
+++ b/data/presets/presets/leisure/pitch.json
@@ -12,6 +12,8 @@
     "tags": {
         "leisure": "pitch"
     },
-    "terms": [],
+    "terms": [
+        "field"
+    ],
     "name": "Sport Pitch"
 }
diff --git a/data/presets/presets/leisure/slipway.json b/data/presets/presets/leisure/slipway.json
index 1a50e69c1..070dee4d9 100644
--- a/data/presets/presets/leisure/slipway.json
+++ b/data/presets/presets/leisure/slipway.json
@@ -3,6 +3,10 @@
         "point",
         "line"
     ],
+    "terms": [
+        "boat launch",
+        "boat ramp"
+    ],
     "tags": {
         "leisure": "slipway"
     },
diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json
index 5640caa40..554ecb212 100644
--- a/data/presets/presets/leisure/swimming_pool.json
+++ b/data/presets/presets/leisure/swimming_pool.json
@@ -1,4 +1,5 @@
 {
+    "icon": "swimming",
     "fields": [
         "access_simple",
         "operator",
@@ -12,6 +13,5 @@
     "tags": {
         "leisure": "swimming_pool"
     },
-    "icon": "swimming",
     "name": "Swimming Pool"
 }
diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json
index 895b83d7c..d9879e230 100644
--- a/data/presets/presets/shop.json
+++ b/data/presets/presets/shop.json
@@ -2,13 +2,13 @@
     "icon": "shop",
     "fields": [
         "shop",
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/shop/alcohol.json b/data/presets/presets/shop/alcohol.json
index 37d6f77a3..0332c3059 100644
--- a/data/presets/presets/shop/alcohol.json
+++ b/data/presets/presets/shop/alcohol.json
@@ -1,17 +1,20 @@
 {
     "icon": "alcohol-shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "alcohol"
+        "alcohol",
+        "beer",
+        "booze",
+        "wine"
     ],
     "tags": {
         "shop": "alcohol"
diff --git a/data/presets/presets/shop/anime.json b/data/presets/presets/shop/anime.json
new file mode 100644
index 000000000..0e7a2722c
--- /dev/null
+++ b/data/presets/presets/shop/anime.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "anime"
+    },
+    "name": "Anime Shop"
+}
diff --git a/data/presets/presets/shop/antiques.json b/data/presets/presets/shop/antiques.json
new file mode 100644
index 000000000..c8cdeab25
--- /dev/null
+++ b/data/presets/presets/shop/antiques.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "antiques"
+    },
+    "name": "Antiques Shop"
+}
diff --git a/data/presets/presets/shop/art.json b/data/presets/presets/shop/art.json
index 2f782fe80..1bb0008f1 100644
--- a/data/presets/presets/shop/art.json
+++ b/data/presets/presets/shop/art.json
@@ -1,20 +1,17 @@
 {
     "icon": "art-gallery",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
-    "terms": [
-        "art*"
-    ],
     "tags": {
         "shop": "art"
     },
-    "name": "Art Shop"
+    "name": "Art Gallery"
 }
diff --git a/data/presets/presets/shop/baby_goods.json b/data/presets/presets/shop/baby_goods.json
new file mode 100644
index 000000000..4028f7694
--- /dev/null
+++ b/data/presets/presets/shop/baby_goods.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "baby_goods"
+    },
+    "name": "Baby Goods Store"
+}
diff --git a/data/presets/presets/shop/bag.json b/data/presets/presets/shop/bag.json
new file mode 100644
index 000000000..dc8e860f1
--- /dev/null
+++ b/data/presets/presets/shop/bag.json
@@ -0,0 +1,21 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "handbag",
+        "purse"
+    ],
+    "tags": {
+        "shop": "bag"
+    },
+    "name": "Bag/Luggage Store"
+}
diff --git a/data/presets/presets/shop/bakery.json b/data/presets/presets/shop/bakery.json
index 51113eacf..f73eac7b7 100644
--- a/data/presets/presets/shop/bakery.json
+++ b/data/presets/presets/shop/bakery.json
@@ -1,17 +1,17 @@
 {
     "icon": "bakery",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "bakery"
     },
     "name": "Bakery"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/bathroom_furnishing.json b/data/presets/presets/shop/bathroom_furnishing.json
new file mode 100644
index 000000000..ef8bb5eea
--- /dev/null
+++ b/data/presets/presets/shop/bathroom_furnishing.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "bathroom_furnishing"
+    },
+    "name": "Bathroom Furnishing Store"
+}
diff --git a/data/presets/presets/shop/beauty.json b/data/presets/presets/shop/beauty.json
index e44052b83..8f2dab6bb 100644
--- a/data/presets/presets/shop/beauty.json
+++ b/data/presets/presets/shop/beauty.json
@@ -1,13 +1,13 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
diff --git a/data/presets/presets/shop/bed.json b/data/presets/presets/shop/bed.json
new file mode 100644
index 000000000..c01e992ca
--- /dev/null
+++ b/data/presets/presets/shop/bed.json
@@ -0,0 +1,17 @@
+{
+    "icon": "lodging",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "bed"
+    },
+    "name": "Bedding/Mattress Store"
+}
diff --git a/data/presets/presets/shop/beverages.json b/data/presets/presets/shop/beverages.json
index 85fbc68b4..21bf2626d 100644
--- a/data/presets/presets/shop/beverages.json
+++ b/data/presets/presets/shop/beverages.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "beverages"
     },
     "name": "Beverage Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/bicycle.json b/data/presets/presets/shop/bicycle.json
index 657891673..f6a062cbb 100644
--- a/data/presets/presets/shop/bicycle.json
+++ b/data/presets/presets/shop/bicycle.json
@@ -1,17 +1,17 @@
 {
     "icon": "bicycle",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "bicycle"
     },
     "name": "Bicycle Shop"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/bookmaker.json b/data/presets/presets/shop/bookmaker.json
index 5fd998f10..939b4527f 100644
--- a/data/presets/presets/shop/bookmaker.json
+++ b/data/presets/presets/shop/bookmaker.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "bookmaker"
     },
     "name": "Bookmaker"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/books.json b/data/presets/presets/shop/books.json
index 9d959d019..11c9794c9 100644
--- a/data/presets/presets/shop/books.json
+++ b/data/presets/presets/shop/books.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "books"
     },
-    "name": "Bookstore"
-}
\ No newline at end of file
+    "name": "Book Store"
+}
diff --git a/data/presets/presets/shop/boutique.json b/data/presets/presets/shop/boutique.json
index 256ecde23..607a4ced3 100644
--- a/data/presets/presets/shop/boutique.json
+++ b/data/presets/presets/shop/boutique.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "boutique"
     },
     "name": "Boutique"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/butcher.json b/data/presets/presets/shop/butcher.json
index ea00b022f..ab856b4d7 100644
--- a/data/presets/presets/shop/butcher.json
+++ b/data/presets/presets/shop/butcher.json
@@ -1,17 +1,20 @@
 {
     "icon": "slaughterhouse",
     "fields": [
+        "operator",
+        "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
-    "terms": [],
+    "terms": [
+        "meat"
+    ],
     "tags": {
         "shop": "butcher"
     },
     "name": "Butcher"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/candles.json b/data/presets/presets/shop/candles.json
new file mode 100644
index 000000000..00494564a
--- /dev/null
+++ b/data/presets/presets/shop/candles.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "candles"
+    },
+    "name": "Candle Shop"
+}
diff --git a/data/presets/presets/shop/car.json b/data/presets/presets/shop/car.json
index 3a29dc8cc..5e616b835 100644
--- a/data/presets/presets/shop/car.json
+++ b/data/presets/presets/shop/car.json
@@ -1,16 +1,20 @@
 {
     "icon": "car",
     "fields": [
+        "operator",
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "auto"
+    ],
     "tags": {
         "shop": "car"
     },
     "name": "Car Dealership"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/car_parts.json b/data/presets/presets/shop/car_parts.json
index 4ea1687e6..8809bbe9e 100644
--- a/data/presets/presets/shop/car_parts.json
+++ b/data/presets/presets/shop/car_parts.json
@@ -1,15 +1,18 @@
 {
     "icon": "car",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "auto"
+    ],
     "tags": {
         "shop": "car_parts"
     },
diff --git a/data/presets/presets/shop/car_repair.json b/data/presets/presets/shop/car_repair.json
index 29daa9234..90532736c 100644
--- a/data/presets/presets/shop/car_repair.json
+++ b/data/presets/presets/shop/car_repair.json
@@ -1,15 +1,18 @@
 {
     "icon": "car",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "auto"
+    ],
     "tags": {
         "shop": "car_repair"
     },
diff --git a/data/presets/presets/shop/carpet.json b/data/presets/presets/shop/carpet.json
new file mode 100644
index 000000000..bca50088f
--- /dev/null
+++ b/data/presets/presets/shop/carpet.json
@@ -0,0 +1,20 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "rug"
+    ],
+    "tags": {
+        "shop": "carpet"
+    },
+    "name": "Carpet Store"
+}
diff --git a/data/presets/presets/shop/cheese.json b/data/presets/presets/shop/cheese.json
new file mode 100644
index 000000000..48352ba14
--- /dev/null
+++ b/data/presets/presets/shop/cheese.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "cheese"
+    },
+    "name": "Cheese Store"
+}
diff --git a/data/presets/presets/shop/chemist.json b/data/presets/presets/shop/chemist.json
index 116052c58..fec98e1c4 100644
--- a/data/presets/presets/shop/chemist.json
+++ b/data/presets/presets/shop/chemist.json
@@ -1,13 +1,13 @@
 {
     "icon": "chemist",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/shop/chocolate.json b/data/presets/presets/shop/chocolate.json
new file mode 100644
index 000000000..9edff15d2
--- /dev/null
+++ b/data/presets/presets/shop/chocolate.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "chocolate"
+    },
+    "name": "Chocolate Store"
+}
diff --git a/data/presets/presets/shop/clothes.json b/data/presets/presets/shop/clothes.json
index 4e0cbc454..0f1b638b7 100644
--- a/data/presets/presets/shop/clothes.json
+++ b/data/presets/presets/shop/clothes.json
@@ -1,17 +1,17 @@
 {
     "icon": "clothing-store",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "clothes"
     },
     "name": "Clothing Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/computer.json b/data/presets/presets/shop/computer.json
index e69c363fc..77728fd0b 100644
--- a/data/presets/presets/shop/computer.json
+++ b/data/presets/presets/shop/computer.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "computer"
     },
     "name": "Computer Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/confectionery.json b/data/presets/presets/shop/confectionery.json
index 90dd454cf..46cc1001e 100644
--- a/data/presets/presets/shop/confectionery.json
+++ b/data/presets/presets/shop/confectionery.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "confectionery"
     },
-    "name": "Confectionery"
-}
\ No newline at end of file
+    "name": "Candy Store"
+}
diff --git a/data/presets/presets/shop/convenience.json b/data/presets/presets/shop/convenience.json
index f2b0604ea..7973f5e63 100644
--- a/data/presets/presets/shop/convenience.json
+++ b/data/presets/presets/shop/convenience.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "convenience"
     },
     "name": "Convenience Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/copyshop.json b/data/presets/presets/shop/copyshop.json
new file mode 100644
index 000000000..047b425be
--- /dev/null
+++ b/data/presets/presets/shop/copyshop.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "copyshop"
+    },
+    "name": "Copy Store"
+}
diff --git a/data/presets/presets/shop/cosmetics.json b/data/presets/presets/shop/cosmetics.json
new file mode 100644
index 000000000..65be932bc
--- /dev/null
+++ b/data/presets/presets/shop/cosmetics.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "cosmetics"
+    },
+    "name": "Cosmetics Store"
+}
diff --git a/data/presets/presets/shop/craft.json b/data/presets/presets/shop/craft.json
new file mode 100644
index 000000000..2f39e46a8
--- /dev/null
+++ b/data/presets/presets/shop/craft.json
@@ -0,0 +1,17 @@
+{
+    "icon": "art-gallery",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "craft"
+    },
+    "name": "Arts and Crafts Store"
+}
diff --git a/data/presets/presets/shop/curtain.json b/data/presets/presets/shop/curtain.json
new file mode 100644
index 000000000..410bcf2b0
--- /dev/null
+++ b/data/presets/presets/shop/curtain.json
@@ -0,0 +1,21 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "drape*",
+        "window"
+    ],
+    "tags": {
+        "shop": "curtain"
+    },
+    "name": "Curtain Store"
+}
diff --git a/data/presets/presets/shop/dairy.json b/data/presets/presets/shop/dairy.json
new file mode 100644
index 000000000..7b611e34d
--- /dev/null
+++ b/data/presets/presets/shop/dairy.json
@@ -0,0 +1,22 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "milk",
+        "egg",
+        "cheese"
+    ],
+    "tags": {
+        "shop": "dairy"
+    },
+    "name": "Dairy Store"
+}
diff --git a/data/presets/presets/shop/deli.json b/data/presets/presets/shop/deli.json
index efe8b1eb1..21a6e4737 100644
--- a/data/presets/presets/shop/deli.json
+++ b/data/presets/presets/shop/deli.json
@@ -1,17 +1,22 @@
 {
     "icon": "restaurant",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "lunch",
+        "meat",
+        "sandwich"
+    ],
     "tags": {
         "shop": "deli"
     },
     "name": "Deli"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/department_store.json b/data/presets/presets/shop/department_store.json
index 8492cb6c0..6c8e3d09b 100644
--- a/data/presets/presets/shop/department_store.json
+++ b/data/presets/presets/shop/department_store.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "department_store"
     },
     "name": "Department Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/doityourself.json b/data/presets/presets/shop/doityourself.json
index 02a3d1928..af771ac74 100644
--- a/data/presets/presets/shop/doityourself.json
+++ b/data/presets/presets/shop/doityourself.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "doityourself"
     },
     "name": "DIY Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/dry_cleaning.json b/data/presets/presets/shop/dry_cleaning.json
index 2f1f6b2b4..7e8557536 100644
--- a/data/presets/presets/shop/dry_cleaning.json
+++ b/data/presets/presets/shop/dry_cleaning.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "dry_cleaning"
     },
-    "name": "Dry Cleaners"
-}
\ No newline at end of file
+    "name": "Dry Cleaner"
+}
diff --git a/data/presets/presets/shop/electronics.json b/data/presets/presets/shop/electronics.json
index 0c95717c4..e525c6bbf 100644
--- a/data/presets/presets/shop/electronics.json
+++ b/data/presets/presets/shop/electronics.json
@@ -1,17 +1,23 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "appliance",
+        "audio",
+        "computer",
+        "tv"
+    ],
     "tags": {
         "shop": "electronics"
     },
     "name": "Electronics Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/erotic.json b/data/presets/presets/shop/erotic.json
new file mode 100644
index 000000000..2bb2c25ff
--- /dev/null
+++ b/data/presets/presets/shop/erotic.json
@@ -0,0 +1,21 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "sex",
+        "porn"
+    ],
+    "tags": {
+        "shop": "erotic"
+    },
+    "name": "Erotic Store"
+}
diff --git a/data/presets/presets/shop/fabric.json b/data/presets/presets/shop/fabric.json
new file mode 100644
index 000000000..e038ebb67
--- /dev/null
+++ b/data/presets/presets/shop/fabric.json
@@ -0,0 +1,20 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "sew"
+    ],
+    "tags": {
+        "shop": "fabric"
+    },
+    "name": "Fabric Store"
+}
diff --git a/data/presets/presets/shop/farm.json b/data/presets/presets/shop/farm.json
index fd7898253..36649ba3d 100644
--- a/data/presets/presets/shop/farm.json
+++ b/data/presets/presets/shop/farm.json
@@ -1,21 +1,21 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
-    "tags": {
-        "shop": "farm"
-    },
     "terms": [
         "farm shop",
         "farm stand"
     ],
+    "tags": {
+        "shop": "farm"
+    },
     "name": "Produce Stand"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/fashion.json b/data/presets/presets/shop/fashion.json
new file mode 100644
index 000000000..73d256494
--- /dev/null
+++ b/data/presets/presets/shop/fashion.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "fashion"
+    },
+    "name": "Fashion Store"
+}
diff --git a/data/presets/presets/shop/fishmonger.json b/data/presets/presets/shop/fishmonger.json
index 08b98aa09..8f11f3f6a 100644
--- a/data/presets/presets/shop/fishmonger.json
+++ b/data/presets/presets/shop/fishmonger.json
@@ -1,13 +1,13 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
@@ -15,4 +15,4 @@
     },
     "name": "Fishmonger",
     "searchable": false
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/florist.json b/data/presets/presets/shop/florist.json
index 05e1fd66f..504a8c3e5 100644
--- a/data/presets/presets/shop/florist.json
+++ b/data/presets/presets/shop/florist.json
@@ -1,17 +1,20 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "flower"
+    ],
     "tags": {
         "shop": "florist"
     },
     "name": "Florist"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/frame.json b/data/presets/presets/shop/frame.json
new file mode 100644
index 000000000..1415959d0
--- /dev/null
+++ b/data/presets/presets/shop/frame.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "frame"
+    },
+    "name": "Framing Shop"
+}
diff --git a/data/presets/presets/shop/funeral_directors.json b/data/presets/presets/shop/funeral_directors.json
index 6e56e583d..ddb5a53e0 100644
--- a/data/presets/presets/shop/funeral_directors.json
+++ b/data/presets/presets/shop/funeral_directors.json
@@ -1,6 +1,7 @@
 {
     "icon": "cemetery",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "religion",
@@ -8,13 +9,10 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
         "undertaker",
-        "funeral parlour",
-        "funeral parlor",
         "memorial home"
     ],
     "tags": {
diff --git a/data/presets/presets/shop/furnace.json b/data/presets/presets/shop/furnace.json
new file mode 100644
index 000000000..eef8aae76
--- /dev/null
+++ b/data/presets/presets/shop/furnace.json
@@ -0,0 +1,21 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "oven",
+        "stove"
+    ],
+    "tags": {
+        "shop": "furnace"
+    },
+    "name": "Furnace Store"
+}
diff --git a/data/presets/presets/shop/furniture.json b/data/presets/presets/shop/furniture.json
index aeefef068..cc6a212a0 100644
--- a/data/presets/presets/shop/furniture.json
+++ b/data/presets/presets/shop/furniture.json
@@ -1,17 +1,22 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "chair",
+        "sofa",
+        "table"
+    ],
     "tags": {
         "shop": "furniture"
     },
     "name": "Furniture Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/garden_centre.json b/data/presets/presets/shop/garden_centre.json
index c37ce54b5..363fa60ff 100644
--- a/data/presets/presets/shop/garden_centre.json
+++ b/data/presets/presets/shop/garden_centre.json
@@ -1,20 +1,23 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "garden centre"
+        "landscape",
+        "mulch",
+        "shrub",
+        "tree"
     ],
     "tags": {
         "shop": "garden_centre"
     },
     "name": "Garden Center"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/gift.json b/data/presets/presets/shop/gift.json
index 8188ddd28..29da3446d 100644
--- a/data/presets/presets/shop/gift.json
+++ b/data/presets/presets/shop/gift.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "gift"
     },
     "name": "Gift Shop"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/greengrocer.json b/data/presets/presets/shop/greengrocer.json
index 373fd85b7..8977111f3 100644
--- a/data/presets/presets/shop/greengrocer.json
+++ b/data/presets/presets/shop/greengrocer.json
@@ -1,17 +1,21 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "fruit",
+        "vegetable"
+    ],
     "tags": {
         "shop": "greengrocer"
     },
     "name": "Greengrocer"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/hairdresser.json b/data/presets/presets/shop/hairdresser.json
index 962f97506..b1de6a6e7 100644
--- a/data/presets/presets/shop/hairdresser.json
+++ b/data/presets/presets/shop/hairdresser.json
@@ -1,13 +1,13 @@
 {
     "icon": "hairdresser",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/shop/hardware.json b/data/presets/presets/shop/hardware.json
index 1e191d0f4..349a716d7 100644
--- a/data/presets/presets/shop/hardware.json
+++ b/data/presets/presets/shop/hardware.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "hardware"
     },
     "name": "Hardware Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/hearing_aids.json b/data/presets/presets/shop/hearing_aids.json
new file mode 100644
index 000000000..e5225565b
--- /dev/null
+++ b/data/presets/presets/shop/hearing_aids.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "hearing_aids"
+    },
+    "name": "Hearing Aids Store"
+}
diff --git a/data/presets/presets/shop/herbalist.json b/data/presets/presets/shop/herbalist.json
new file mode 100644
index 000000000..321819317
--- /dev/null
+++ b/data/presets/presets/shop/herbalist.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "herbalist"
+    },
+    "name": "Herbalist"
+}
diff --git a/data/presets/presets/shop/hifi.json b/data/presets/presets/shop/hifi.json
index 63e8c683a..e6051314f 100644
--- a/data/presets/presets/shop/hifi.json
+++ b/data/presets/presets/shop/hifi.json
@@ -1,17 +1,21 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "stereo",
+        "video"
+    ],
     "tags": {
         "shop": "hifi"
     },
     "name": "Hifi Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/interior_decoration.json b/data/presets/presets/shop/interior_decoration.json
new file mode 100644
index 000000000..1c6d49752
--- /dev/null
+++ b/data/presets/presets/shop/interior_decoration.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "interior_decoration"
+    },
+    "name": "Interior Decoration Store"
+}
diff --git a/data/presets/presets/shop/jewelry.json b/data/presets/presets/shop/jewelry.json
index c9264f944..1132ff2a3 100644
--- a/data/presets/presets/shop/jewelry.json
+++ b/data/presets/presets/shop/jewelry.json
@@ -1,17 +1,22 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "diamond",
+        "gem",
+        "ring"
+    ],
     "tags": {
         "shop": "jewelry"
     },
     "name": "Jeweler"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/kiosk.json b/data/presets/presets/shop/kiosk.json
index f14f3ebdd..e9d08b8f5 100644
--- a/data/presets/presets/shop/kiosk.json
+++ b/data/presets/presets/shop/kiosk.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "kiosk"
     },
-    "name": "Kiosk"
-}
\ No newline at end of file
+    "name": "News Kiosk"
+}
diff --git a/data/presets/presets/shop/kitchen.json b/data/presets/presets/shop/kitchen.json
new file mode 100644
index 000000000..1fcef9122
--- /dev/null
+++ b/data/presets/presets/shop/kitchen.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "kitchen"
+    },
+    "name": "Kitchen Design Store"
+}
diff --git a/data/presets/presets/shop/laundry.json b/data/presets/presets/shop/laundry.json
index 082920b4b..f94303634 100644
--- a/data/presets/presets/shop/laundry.json
+++ b/data/presets/presets/shop/laundry.json
@@ -1,17 +1,17 @@
 {
     "icon": "laundry",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "laundry"
     },
     "name": "Laundry"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/leather.json b/data/presets/presets/shop/leather.json
new file mode 100644
index 000000000..1d25fa4ad
--- /dev/null
+++ b/data/presets/presets/shop/leather.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "leather"
+    },
+    "name": "Leather Store"
+}
diff --git a/data/presets/presets/shop/locksmith.json b/data/presets/presets/shop/locksmith.json
index aadcc8c89..c6d1cd884 100644
--- a/data/presets/presets/shop/locksmith.json
+++ b/data/presets/presets/shop/locksmith.json
@@ -1,18 +1,18 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "key*",
-        "lock*"
+        "key",
+        "lockpick"
     ],
     "tags": {
         "shop": "locksmith"
diff --git a/data/presets/presets/shop/lottery.json b/data/presets/presets/shop/lottery.json
index 3f38a3fb4..8f91ab12e 100644
--- a/data/presets/presets/shop/lottery.json
+++ b/data/presets/presets/shop/lottery.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "lottery"
     },
     "name": "Lottery Shop"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/mall.json b/data/presets/presets/shop/mall.json
index 059fb5749..70a8dd487 100644
--- a/data/presets/presets/shop/mall.json
+++ b/data/presets/presets/shop/mall.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "mall"
     },
     "name": "Mall"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/massage.json b/data/presets/presets/shop/massage.json
new file mode 100644
index 000000000..d1d5ff95b
--- /dev/null
+++ b/data/presets/presets/shop/massage.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "massage"
+    },
+    "name": "Massage Shop"
+}
diff --git a/data/presets/presets/shop/medical_supply.json b/data/presets/presets/shop/medical_supply.json
new file mode 100644
index 000000000..2f608c4f1
--- /dev/null
+++ b/data/presets/presets/shop/medical_supply.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "medical_supply"
+    },
+    "name": "Medical Supply Store"
+}
diff --git a/data/presets/presets/shop/mobile_phone.json b/data/presets/presets/shop/mobile_phone.json
index f032fd1b2..45b11be72 100644
--- a/data/presets/presets/shop/mobile_phone.json
+++ b/data/presets/presets/shop/mobile_phone.json
@@ -1,13 +1,13 @@
 {
     "icon": "mobilephone",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/shop/money_lender.json b/data/presets/presets/shop/money_lender.json
new file mode 100644
index 000000000..43da938b0
--- /dev/null
+++ b/data/presets/presets/shop/money_lender.json
@@ -0,0 +1,17 @@
+{
+    "icon": "bank",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "money_lender"
+    },
+    "name": "Money Lender"
+}
diff --git a/data/presets/presets/shop/motorcycle.json b/data/presets/presets/shop/motorcycle.json
index d9ed64e2a..d4faa2b75 100644
--- a/data/presets/presets/shop/motorcycle.json
+++ b/data/presets/presets/shop/motorcycle.json
@@ -1,13 +1,13 @@
 {
     "icon": "scooter",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/shop/music.json b/data/presets/presets/shop/music.json
index 1ed3991f6..f43d17949 100644
--- a/data/presets/presets/shop/music.json
+++ b/data/presets/presets/shop/music.json
@@ -1,17 +1,21 @@
 {
     "icon": "music",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "CD",
+        "vinyl"
+    ],
     "tags": {
         "shop": "music"
     },
     "name": "Music Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/musical_instrument.json b/data/presets/presets/shop/musical_instrument.json
new file mode 100644
index 000000000..c1750dad2
--- /dev/null
+++ b/data/presets/presets/shop/musical_instrument.json
@@ -0,0 +1,17 @@
+{
+    "icon": "music",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "musical_instrument"
+    },
+    "name": "Musical Instrument Store"
+}
diff --git a/data/presets/presets/shop/newsagent.json b/data/presets/presets/shop/newsagent.json
index 4059c5314..9c0bcd287 100644
--- a/data/presets/presets/shop/newsagent.json
+++ b/data/presets/presets/shop/newsagent.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "newsagent"
     },
-    "name": "Newsagent"
-}
\ No newline at end of file
+    "name": "Newspaper/Magazine Shop"
+}
diff --git a/data/presets/presets/shop/optician.json b/data/presets/presets/shop/optician.json
index 31f207837..bf91c1a8a 100644
--- a/data/presets/presets/shop/optician.json
+++ b/data/presets/presets/shop/optician.json
@@ -1,17 +1,21 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "eye",
+        "glasses"
+    ],
     "tags": {
         "shop": "optician"
     },
     "name": "Optician"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/organic.json b/data/presets/presets/shop/organic.json
new file mode 100644
index 000000000..f0cd0edc7
--- /dev/null
+++ b/data/presets/presets/shop/organic.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "organic"
+    },
+    "name": "Organic Goods Store"
+}
diff --git a/data/presets/presets/shop/outdoor.json b/data/presets/presets/shop/outdoor.json
index bbcc653ad..c4f030c06 100644
--- a/data/presets/presets/shop/outdoor.json
+++ b/data/presets/presets/shop/outdoor.json
@@ -1,17 +1,22 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "camping",
+        "climbing",
+        "hiking"
+    ],
     "tags": {
         "shop": "outdoor"
     },
-    "name": "Outdoor Store"
-}
\ No newline at end of file
+    "name": "Outdoors Store"
+}
diff --git a/data/presets/presets/shop/paint.json b/data/presets/presets/shop/paint.json
new file mode 100644
index 000000000..6c211f080
--- /dev/null
+++ b/data/presets/presets/shop/paint.json
@@ -0,0 +1,17 @@
+{
+    "icon": "water",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "paint"
+    },
+    "name": "Paint Store"
+}
diff --git a/data/presets/presets/shop/pawnbroker.json b/data/presets/presets/shop/pawnbroker.json
new file mode 100644
index 000000000..23be8843e
--- /dev/null
+++ b/data/presets/presets/shop/pawnbroker.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "pawnbroker"
+    },
+    "name": "Pawn Shop"
+}
diff --git a/data/presets/presets/shop/pet.json b/data/presets/presets/shop/pet.json
index c4cb0cd01..ee048d82e 100644
--- a/data/presets/presets/shop/pet.json
+++ b/data/presets/presets/shop/pet.json
@@ -1,17 +1,22 @@
 {
     "icon": "dog-park",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "cat",
+        "dog",
+        "fish"
+    ],
     "tags": {
         "shop": "pet"
     },
     "name": "Pet Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/photo.json b/data/presets/presets/shop/photo.json
index 306b40789..03d246b03 100644
--- a/data/presets/presets/shop/photo.json
+++ b/data/presets/presets/shop/photo.json
@@ -1,17 +1,21 @@
 {
     "icon": "camera",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "camera",
+        "film"
+    ],
     "tags": {
         "shop": "photo"
     },
     "name": "Photography Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/pyrotechnics.json b/data/presets/presets/shop/pyrotechnics.json
new file mode 100644
index 000000000..4de8ac50b
--- /dev/null
+++ b/data/presets/presets/shop/pyrotechnics.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "pyrotechnics"
+    },
+    "name": "Fireworks Store"
+}
diff --git a/data/presets/presets/shop/radiotechnics.json b/data/presets/presets/shop/radiotechnics.json
new file mode 100644
index 000000000..f14bc8edd
--- /dev/null
+++ b/data/presets/presets/shop/radiotechnics.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "radiotechnics"
+    },
+    "name": "Radio/Electronic Component Store"
+}
diff --git a/data/presets/presets/shop/religion.json b/data/presets/presets/shop/religion.json
new file mode 100644
index 000000000..10c8b2bf6
--- /dev/null
+++ b/data/presets/presets/shop/religion.json
@@ -0,0 +1,19 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "religion",
+        "denomination"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "religion"
+    },
+    "name": "Religious Store"
+}
diff --git a/data/presets/presets/shop/scuba_diving.json b/data/presets/presets/shop/scuba_diving.json
new file mode 100644
index 000000000..b946ae7d6
--- /dev/null
+++ b/data/presets/presets/shop/scuba_diving.json
@@ -0,0 +1,17 @@
+{
+    "icon": "swimming",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "scuba_diving"
+    },
+    "name": "Scuba Diving Shop"
+}
diff --git a/data/presets/presets/shop/seafood.json b/data/presets/presets/shop/seafood.json
index a964dcc88..862002492 100644
--- a/data/presets/presets/shop/seafood.json
+++ b/data/presets/presets/shop/seafood.json
@@ -1,20 +1,20 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "fishmonger"
+    ],
     "tags": {
         "shop": "seafood"
     },
-    "terms": [
-        "fishmonger"
-    ],
     "name": "Seafood Shop"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/second_hand.json b/data/presets/presets/shop/second_hand.json
new file mode 100644
index 000000000..356d11c1b
--- /dev/null
+++ b/data/presets/presets/shop/second_hand.json
@@ -0,0 +1,24 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "secondhand",
+        "second hand",
+        "resale",
+        "thrift",
+        "used"
+    ],
+    "tags": {
+        "shop": "second_hand"
+    },
+    "name": "Consignment/Thrift Store"
+}
diff --git a/data/presets/presets/shop/shoes.json b/data/presets/presets/shop/shoes.json
index 1a9e29b34..5e8e228cd 100644
--- a/data/presets/presets/shop/shoes.json
+++ b/data/presets/presets/shop/shoes.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "shoes"
     },
     "name": "Shoe Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/sports.json b/data/presets/presets/shop/sports.json
index 2b0d21e7b..b64be9105 100644
--- a/data/presets/presets/shop/sports.json
+++ b/data/presets/presets/shop/sports.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "sports"
     },
     "name": "Sporting Goods Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/stationery.json b/data/presets/presets/shop/stationery.json
index de2a89934..982698346 100644
--- a/data/presets/presets/shop/stationery.json
+++ b/data/presets/presets/shop/stationery.json
@@ -1,17 +1,21 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "card",
+        "paper"
+    ],
     "tags": {
         "shop": "stationery"
     },
     "name": "Stationery Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json
index eab992b0f..05cb8039b 100644
--- a/data/presets/presets/shop/supermarket.json
+++ b/data/presets/presets/shop/supermarket.json
@@ -2,38 +2,18 @@
     "icon": "grocery",
     "fields": [
         "operator",
-        "building_area",
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "bazaar",
-        "boutique",
-        "chain",
-        "co-op",
-        "cut-rate store",
-        "discount store",
-        "five-and-dime",
-        "flea market",
-        "galleria",
-        "grocery store",
-        "mall",
-        "mart",
-        "outlet",
-        "outlet store",
-        "shop",
-        "shopping center",
-        "shopping centre",
-        "shopping plaza",
-        "stand",
+        "grocery",
         "store",
-        "supermarket",
-        "thrift shop"
+        "shop"
     ],
     "tags": {
         "shop": "supermarket"
diff --git a/data/presets/presets/shop/tailor.json b/data/presets/presets/shop/tailor.json
index 96cbad711..6f0394cf1 100644
--- a/data/presets/presets/shop/tailor.json
+++ b/data/presets/presets/shop/tailor.json
@@ -1,21 +1,21 @@
 {
     "icon": "clothing-store",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "clothes",
+        "suit"
+    ],
     "tags": {
         "shop": "tailor"
     },
-    "terms": [
-        "tailor",
-        "clothes"
-    ],
     "name": "Tailor"
 }
diff --git a/data/presets/presets/shop/tattoo.json b/data/presets/presets/shop/tattoo.json
new file mode 100644
index 000000000..e920fc058
--- /dev/null
+++ b/data/presets/presets/shop/tattoo.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "tattoo"
+    },
+    "name": "Tattoo Parlor"
+}
diff --git a/data/presets/presets/shop/tea.json b/data/presets/presets/shop/tea.json
new file mode 100644
index 000000000..2afb7d62a
--- /dev/null
+++ b/data/presets/presets/shop/tea.json
@@ -0,0 +1,17 @@
+{
+    "icon": "cafe",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "tea"
+    },
+    "name": "Tea Store"
+}
diff --git a/data/presets/presets/shop/ticket.json b/data/presets/presets/shop/ticket.json
new file mode 100644
index 000000000..f7eb42290
--- /dev/null
+++ b/data/presets/presets/shop/ticket.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "ticket"
+    },
+    "name": "Ticket Seller"
+}
diff --git a/data/presets/presets/shop/tobacco.json b/data/presets/presets/shop/tobacco.json
new file mode 100644
index 000000000..41a4a4f9c
--- /dev/null
+++ b/data/presets/presets/shop/tobacco.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "tobacco"
+    },
+    "name": "Tobacco Shop"
+}
diff --git a/data/presets/presets/shop/toys.json b/data/presets/presets/shop/toys.json
index 773a63e59..cbe816841 100644
--- a/data/presets/presets/shop/toys.json
+++ b/data/presets/presets/shop/toys.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "toys"
     },
     "name": "Toy Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/travel_agency.json b/data/presets/presets/shop/travel_agency.json
index 320112506..4a6f38cc3 100644
--- a/data/presets/presets/shop/travel_agency.json
+++ b/data/presets/presets/shop/travel_agency.json
@@ -1,17 +1,17 @@
 {
     "icon": "suitcase",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "travel_agency"
     },
     "name": "Travel Agency"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/tyres.json b/data/presets/presets/shop/tyres.json
index 9e0f6770e..c0755c7b0 100644
--- a/data/presets/presets/shop/tyres.json
+++ b/data/presets/presets/shop/tyres.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "tyres"
     },
     "name": "Tire Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/vacant.json b/data/presets/presets/shop/vacant.json
index 3dc7e29c9..36329f31d 100644
--- a/data/presets/presets/shop/vacant.json
+++ b/data/presets/presets/shop/vacant.json
@@ -2,16 +2,15 @@
     "icon": "shop",
     "fields": [
         "address",
-        "building_area",
-        "opening_hours"
+        "building_area"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "vacant"
     },
-    "name": "Vacant Shop"
-}
\ No newline at end of file
+    "name": "Vacant Shop",
+    "searchable": false
+}
diff --git a/data/presets/presets/shop/vacuum_cleaner.json b/data/presets/presets/shop/vacuum_cleaner.json
new file mode 100644
index 000000000..cb06c22b1
--- /dev/null
+++ b/data/presets/presets/shop/vacuum_cleaner.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "vacuum_cleaner"
+    },
+    "name": "Vacuum Cleaner Store"
+}
diff --git a/data/presets/presets/shop/variety_store.json b/data/presets/presets/shop/variety_store.json
index fc8b7055d..eeeaf27fd 100644
--- a/data/presets/presets/shop/variety_store.json
+++ b/data/presets/presets/shop/variety_store.json
@@ -1,17 +1,17 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "variety_store"
     },
     "name": "Variety Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/video.json b/data/presets/presets/shop/video.json
index 1c5e5186b..0034b0b4b 100644
--- a/data/presets/presets/shop/video.json
+++ b/data/presets/presets/shop/video.json
@@ -1,17 +1,20 @@
 {
     "icon": "shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "DVD"
+    ],
     "tags": {
         "shop": "video"
     },
     "name": "Video Store"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/video_games.json b/data/presets/presets/shop/video_games.json
new file mode 100644
index 000000000..ceab1cdab
--- /dev/null
+++ b/data/presets/presets/shop/video_games.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "video_games"
+    },
+    "name": "Video Game Store"
+}
diff --git a/data/presets/presets/shop/water_sports.json b/data/presets/presets/shop/water_sports.json
new file mode 100644
index 000000000..88cabc8de
--- /dev/null
+++ b/data/presets/presets/shop/water_sports.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "water_sports"
+    },
+    "name": "Watersport/Swim Shop"
+}
diff --git a/data/presets/presets/shop/weapons.json b/data/presets/presets/shop/weapons.json
new file mode 100644
index 000000000..020dae4c4
--- /dev/null
+++ b/data/presets/presets/shop/weapons.json
@@ -0,0 +1,23 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "ammo",
+        "gun",
+        "knife",
+        "knives"
+    ],
+    "tags": {
+        "shop": "weapons"
+    },
+    "name": "Weapon Shop"
+}
diff --git a/data/presets/presets/shop/window_blind.json b/data/presets/presets/shop/window_blind.json
new file mode 100644
index 000000000..21b9cfb50
--- /dev/null
+++ b/data/presets/presets/shop/window_blind.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "window_blind"
+    },
+    "name": "Window Blind Store"
+}
diff --git a/data/presets/presets/shop/wine.json b/data/presets/presets/shop/wine.json
index 19322ea4f..c7e527508 100644
--- a/data/presets/presets/shop/wine.json
+++ b/data/presets/presets/shop/wine.json
@@ -1,20 +1,17 @@
 {
     "icon": "alcohol-shop",
     "fields": [
+        "operator",
         "address",
         "building_area",
         "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "shop": "wine"
     },
-    "terms": [
-        "winery"
-    ],
     "name": "Wine Shop"
 }
diff --git a/data/presets/presets/tourism/alpine_hut.json b/data/presets/presets/tourism/alpine_hut.json
index b962c2c00..57b780abe 100644
--- a/data/presets/presets/tourism/alpine_hut.json
+++ b/data/presets/presets/tourism/alpine_hut.json
@@ -7,7 +7,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json
index eeed6142f..4a0cd3f62 100644
--- a/data/presets/presets/tourism/camp_site.json
+++ b/data/presets/presets/tourism/camp_site.json
@@ -10,9 +10,6 @@
         "vertex",
         "area"
     ],
-    "terms": [
-        "camping"
-    ],
     "tags": {
         "tourism": "camp_site"
     },
diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json
index 34c0c23a5..406952024 100644
--- a/data/presets/presets/tourism/chalet.json
+++ b/data/presets/presets/tourism/chalet.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json
index ea0037b3e..1e08f1ad7 100644
--- a/data/presets/presets/tourism/guest_house.json
+++ b/data/presets/presets/tourism/guest_house.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
@@ -16,7 +15,6 @@
     },
     "terms": [
         "B&B",
-        "Bed & Breakfast",
         "Bed and Breakfast"
     ],
     "name": "Guest House"
diff --git a/data/presets/presets/tourism/hostel.json b/data/presets/presets/tourism/hostel.json
index f85844f3e..7db7b3fe3 100644
--- a/data/presets/presets/tourism/hostel.json
+++ b/data/presets/presets/tourism/hostel.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json
index e5ceca24a..e18662c0f 100644
--- a/data/presets/presets/tourism/hotel.json
+++ b/data/presets/presets/tourism/hotel.json
@@ -8,10 +8,8 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
-    "terms": [],
     "tags": {
         "tourism": "hotel"
     },
diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json
index 9e52053d7..f6779e094 100644
--- a/data/presets/presets/tourism/motel.json
+++ b/data/presets/presets/tourism/motel.json
@@ -8,7 +8,6 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json
index cd4b42164..ebebd2167 100644
--- a/data/presets/presets/tourism/museum.json
+++ b/data/presets/presets/tourism/museum.json
@@ -3,27 +3,19 @@
     "fields": [
         "operator",
         "address",
-        "building_area"
+        "building_area",
+        "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
         "exhibition",
-        "exhibits archive",
         "foundation",
         "gallery",
         "hall",
-        "institution",
-        "library",
-        "menagerie",
-        "repository",
-        "salon",
-        "storehouse",
-        "treasury",
-        "vault"
+        "institution"
     ],
     "tags": {
         "tourism": "museum"
diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json
index d3444cde1..7322d882d 100644
--- a/data/presets/presets/tourism/picnic_site.json
+++ b/data/presets/presets/tourism/picnic_site.json
@@ -10,7 +10,9 @@
         "vertex",
         "area"
     ],
-    "terms": [],
+    "terms": [
+        "camp"
+    ],
     "tags": {
         "tourism": "picnic_site"
     },
diff --git a/data/presets/presets/tourism/theme_park.json b/data/presets/presets/tourism/theme_park.json
index 6856bdd92..298f0115f 100644
--- a/data/presets/presets/tourism/theme_park.json
+++ b/data/presets/presets/tourism/theme_park.json
@@ -1,11 +1,11 @@
 {
     "fields": [
         "operator",
-        "address"
+        "address",
+        "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/tourism/zoo.json b/data/presets/presets/tourism/zoo.json
index a9c5c2c19..1925708cd 100644
--- a/data/presets/presets/tourism/zoo.json
+++ b/data/presets/presets/tourism/zoo.json
@@ -2,15 +2,15 @@
     "icon": "zoo",
     "fields": [
         "operator",
-        "address"
+        "address",
+        "opening_hours"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "tags": {
         "tourism": "zoo"
     },
     "name": "Zoo"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 2ad9f5b8c..78205649d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -628,6 +628,9 @@
             "covered": {
                 "label": "Covered"
             },
+            "craft": {
+                "label": "Type"
+            },
             "crop": {
                 "label": "Crop"
             },
@@ -1243,23 +1246,23 @@
             },
             "amenity/arts_centre": {
                 "name": "Arts Center",
-                "terms": "art*"
+                "terms": ""
             },
             "amenity/atm": {
                 "name": "ATM",
-                "terms": ""
+                "terms": "money,cash,machine"
             },
             "amenity/bank": {
                 "name": "Bank",
-                "terms": "coffer,countinghouse,credit union,depository,exchequer,fund,hoard,investment firm,repository,reserve,reservoir,safe,savings,stock,stockpile,store,storehouse,thrift,treasury,trust company,vault"
+                "terms": "credit union,check,deposit,fund,investment,repository,reserve,safe,savings,stock,treasury,trust,vault"
             },
             "amenity/bar": {
                 "name": "Bar",
-                "terms": ""
+                "terms": "dive,beer,bier,booze"
             },
             "amenity/bbq": {
                 "name": "Barbecue/Grill",
-                "terms": "barbecue,bbq,grill"
+                "terms": "bbq"
             },
             "amenity/bench": {
                 "name": "Bench",
@@ -1267,11 +1270,11 @@
             },
             "amenity/bicycle_parking": {
                 "name": "Bicycle Parking",
-                "terms": ""
+                "terms": "bike"
             },
             "amenity/bicycle_rental": {
                 "name": "Bicycle Rental",
-                "terms": ""
+                "terms": "bike"
             },
             "amenity/boat_rental": {
                 "name": "Boat Rental",
@@ -1287,7 +1290,7 @@
             },
             "amenity/cafe": {
                 "name": "Cafe",
-                "terms": "coffee,tea,coffee shop"
+                "terms": "coffee,tea"
             },
             "amenity/car_rental": {
                 "name": "Car Rental",
@@ -1307,15 +1310,15 @@
             },
             "amenity/childcare": {
                 "name": "Nursery/Childcare",
-                "terms": "daycare,nursery,orphanage,playgroup"
+                "terms": "daycare,orphanage,playgroup"
             },
             "amenity/cinema": {
                 "name": "Cinema",
-                "terms": "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
+                "terms": "drive-in,film,flick,movie,theater,picture,show,screen"
             },
             "amenity/clinic": {
                 "name": "Clinic",
-                "terms": "clinic,medical clinic"
+                "terms": "medical,urgentcare"
             },
             "amenity/clock": {
                 "name": "Clock",
@@ -1323,7 +1326,7 @@
             },
             "amenity/college": {
                 "name": "College Grounds",
-                "terms": "college,university"
+                "terms": "university"
             },
             "amenity/compressed_air": {
                 "name": "Compressed Air",
@@ -1335,19 +1338,19 @@
             },
             "amenity/dentist": {
                 "name": "Dentist",
-                "terms": "dentist*,tooth,teeth"
+                "terms": "tooth,teeth"
             },
             "amenity/doctor": {
                 "name": "Doctor",
-                "terms": "doctor*,medic*"
+                "terms": "medic*"
             },
             "amenity/dojo": {
                 "name": "Dojo / Martial Arts Academy",
-                "terms": "martial arts,dojo,dojang"
+                "terms": "martial arts,dojang"
             },
             "amenity/drinking_water": {
                 "name": "Drinking Water",
-                "terms": "water fountain,potable water"
+                "terms": "fountain,potable"
             },
             "amenity/embassy": {
                 "name": "Embassy",
@@ -1355,7 +1358,7 @@
             },
             "amenity/fast_food": {
                 "name": "Fast Food",
-                "terms": ""
+                "terms": "restaurant"
             },
             "amenity/fire_station": {
                 "name": "Fire Station",
@@ -1375,15 +1378,15 @@
             },
             "amenity/hospital": {
                 "name": "Hospital Grounds",
-                "terms": "clinic,emergency room,health service,hospice,infirmary,institution,nursing home,rest home,sanatorium,sanitarium,sick bay,surgery,ward"
+                "terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
             },
             "amenity/kindergarten": {
                 "name": "Preschool/Kindergarten Grounds",
-                "terms": "kindergarten,kindergarden,preschool"
+                "terms": "kindergarden,pre-school"
             },
             "amenity/library": {
                 "name": "Library",
-                "terms": ""
+                "terms": "book"
             },
             "amenity/marketplace": {
                 "name": "Marketplace",
@@ -1415,31 +1418,31 @@
             },
             "amenity/place_of_worship/christian": {
                 "name": "Church",
-                "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
+                "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
             },
             "amenity/place_of_worship/jewish": {
                 "name": "Synagogue",
-                "terms": "jewish,synagogue"
+                "terms": "jewish"
             },
             "amenity/place_of_worship/muslim": {
                 "name": "Mosque",
-                "terms": "muslim,mosque"
+                "terms": "muslim"
             },
             "amenity/police": {
                 "name": "Police",
-                "terms": "badge,bear,blue,bluecoat,bobby,boy scout,bull,constable,constabulary,cop,copper,corps,county mounty,detective,fed,flatfoot,force,fuzz,gendarme,gumshoe,heat,law,law enforcement,man,narc,officers,patrolman,police"
+                "terms": "badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol"
             },
             "amenity/post_box": {
                 "name": "Mailbox",
-                "terms": "letter drop,letterbox,mail drop,mailbox,pillar box,postbox"
+                "terms": "letter,post"
             },
             "amenity/post_office": {
                 "name": "Post Office",
-                "terms": ""
+                "terms": "letter,mail"
             },
             "amenity/pub": {
                 "name": "Pub",
-                "terms": ""
+                "terms": "dive,beer,bier,booze"
             },
             "amenity/ranger_station": {
                 "name": "Ranger Station",
@@ -1447,19 +1450,19 @@
             },
             "amenity/recycling": {
                 "name": "Recycling",
-                "terms": ""
+                "terms": "can,bottle,garbage,scrap,trash"
             },
             "amenity/restaurant": {
                 "name": "Restaurant",
-                "terms": "bar,cafeteria,café,canteen,chophouse,coffee shop,diner,dining room,dive*,doughtnut shop,drive-in,eatery,eating house,eating place,fast-food place,fish and chips,greasy spoon,grill,hamburger stand,hashery,hideaway,hotdog stand,inn,joint*,luncheonette,lunchroom,night club,outlet*,pizzeria,saloon,soda fountain,watering hole"
+                "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
             },
             "amenity/school": {
                 "name": "School Grounds",
-                "terms": "academy,school*"
+                "terms": "academy,elementary school,middle school,high school"
             },
             "amenity/shelter": {
                 "name": "Shelter",
-                "terms": "lean-to"
+                "terms": "lean-to,gazebo,picnic"
             },
             "amenity/social_facility": {
                 "name": "Social Facility",
@@ -1471,7 +1474,7 @@
             },
             "amenity/social_facility/group_home": {
                 "name": "Elderly Group Home",
-                "terms": "elderly,old,senior living"
+                "terms": "old,senior,living"
             },
             "amenity/social_facility/homeless_shelter": {
                 "name": "Homeless Shelter",
@@ -1479,7 +1482,7 @@
             },
             "amenity/studio": {
                 "name": "Studio",
-                "terms": "recording studio,studio,radio,radio studio,television,television studio"
+                "terms": "recording,radio,television"
             },
             "amenity/swimming_pool": {
                 "name": "Swimming Pool",
@@ -1503,15 +1506,15 @@
             },
             "amenity/townhall": {
                 "name": "Town Hall",
-                "terms": "village hall,city government,courthouse,municipal building,municipal center,municipal centre"
+                "terms": "village,city,government,courthouse,municipal"
             },
             "amenity/university": {
                 "name": "University Grounds",
-                "terms": "college,university"
+                "terms": "college"
             },
             "amenity/vending_machine": {
                 "name": "Vending Machine",
-                "terms": ""
+                "terms": "snack,soda,ticket"
             },
             "amenity/veterinary": {
                 "name": "Veterinary",
@@ -1519,7 +1522,7 @@
             },
             "amenity/waste_basket": {
                 "name": "Waste Basket",
-                "terms": "rubbish bin,litter bin,trash can,garbage can"
+                "terms": "rubbish,litter,trash,garbage"
             },
             "area": {
                 "name": "Area",
@@ -1631,7 +1634,7 @@
             },
             "building/college": {
                 "name": "College Building",
-                "terms": "college,university"
+                "terms": "university"
             },
             "building/commercial": {
                 "name": "Commercial Building",
@@ -1687,7 +1690,7 @@
             },
             "building/kindergarten": {
                 "name": "Preschool/Kindergarten Building",
-                "terms": "kindergarten,kindergarden,preschool"
+                "terms": "kindergarden,pre-school"
             },
             "building/public": {
                 "name": "Public Building",
@@ -1707,7 +1710,7 @@
             },
             "building/school": {
                 "name": "School Building",
-                "terms": "academy,school*"
+                "terms": "academy,elementary school,middle school,high school"
             },
             "building/shed": {
                 "name": "Shed",
@@ -1731,191 +1734,199 @@
             },
             "building/university": {
                 "name": "University Building",
-                "terms": "college,university"
+                "terms": "college"
             },
             "building/warehouse": {
                 "name": "Warehouse",
                 "terms": ""
             },
+            "craft": {
+                "name": "Craft",
+                "terms": ""
+            },
             "craft/basket_maker": {
                 "name": "Basket Maker",
-                "terms": "basket*"
+                "terms": ""
             },
             "craft/beekeeper": {
                 "name": "Beekeeper",
-                "terms": "bee*"
+                "terms": ""
             },
             "craft/blacksmith": {
                 "name": "Blacksmith",
-                "terms": "blacksmith"
+                "terms": ""
             },
             "craft/boatbuilder": {
                 "name": "Boat Builder",
-                "terms": "boat builder"
+                "terms": ""
             },
             "craft/bookbinder": {
                 "name": "Bookbinder",
-                "terms": "bookbinder,book repair"
+                "terms": "book repair"
             },
             "craft/brewery": {
                 "name": "Brewery",
-                "terms": "brewery"
+                "terms": "beer,bier"
             },
             "craft/carpenter": {
                 "name": "Carpenter",
-                "terms": "carpenter,woodworker"
+                "terms": "woodworker"
             },
             "craft/carpet_layer": {
                 "name": "Carpet Layer",
-                "terms": "carpet layer"
+                "terms": ""
             },
             "craft/caterer": {
                 "name": "Caterer",
-                "terms": "cater*"
+                "terms": ""
             },
             "craft/clockmaker": {
                 "name": "Clockmaker",
-                "terms": "clock*"
+                "terms": ""
             },
             "craft/confectionary": {
                 "name": "Confectionary",
-                "terms": "confectionary,sweets,candy"
+                "terms": "sweets,candy"
             },
             "craft/dressmaker": {
                 "name": "Dressmaker",
-                "terms": "dress,dressmaker"
+                "terms": "seamstress"
             },
             "craft/electrician": {
                 "name": "Electrician",
-                "terms": "electrician"
+                "terms": "power,wire"
             },
             "craft/gardener": {
                 "name": "Gardener",
-                "terms": "gardener,landscaper,grounds keeper"
+                "terms": "landscaper,grounds keeper"
             },
             "craft/glaziery": {
                 "name": "Glaziery",
-                "terms": "glass,glass foundry,stained-glass,window"
+                "terms": "glass,stained-glass,window"
             },
             "craft/handicraft": {
                 "name": "Handicraft",
-                "terms": "handicraft"
+                "terms": ""
             },
             "craft/hvac": {
                 "name": "HVAC",
-                "terms": "heat*,vent*,air-conditioning,air conditioning"
+                "terms": "heat*,vent*,air conditioning"
             },
             "craft/insulator": {
                 "name": "Insulator",
-                "terms": "insulat*"
+                "terms": ""
             },
             "craft/jeweler": {
                 "name": "Jeweler",
-                "terms": "jeweler,gem,diamond"
+                "terms": ""
             },
             "craft/key_cutter": {
                 "name": "Key Cutter",
-                "terms": "key*"
+                "terms": ""
             },
             "craft/locksmith": {
                 "name": "Locksmith",
-                "terms": "lock*"
+                "terms": ""
             },
             "craft/metal_construction": {
                 "name": "Metal Construction",
-                "terms": "metal construction"
+                "terms": ""
             },
             "craft/optician": {
                 "name": "Optician",
-                "terms": "glasses,optician"
+                "terms": ""
             },
             "craft/painter": {
                 "name": "Painter",
-                "terms": "painter"
+                "terms": ""
             },
             "craft/photographer": {
                 "name": "Photographer",
-                "terms": "photographer"
+                "terms": ""
             },
             "craft/photographic_laboratory": {
                 "name": "Photographic Laboratory",
-                "terms": "photo*,film"
+                "terms": "film"
             },
             "craft/plasterer": {
                 "name": "Plasterer",
-                "terms": "plasterer"
+                "terms": ""
             },
             "craft/plumber": {
                 "name": "Plumber",
-                "terms": "pumber"
+                "terms": "pipe"
             },
             "craft/pottery": {
                 "name": "Pottery",
-                "terms": "potter*,ceramic*"
+                "terms": "ceramic"
             },
             "craft/rigger": {
                 "name": "Rigger",
-                "terms": "rigger"
+                "terms": ""
             },
             "craft/roofer": {
                 "name": "Roofer",
-                "terms": "roofer"
+                "terms": ""
             },
             "craft/saddler": {
                 "name": "Saddler",
-                "terms": "saddle*"
+                "terms": ""
             },
             "craft/sailmaker": {
                 "name": "Sailmaker",
-                "terms": "sail*"
+                "terms": ""
             },
             "craft/sawmill": {
                 "name": "Sawmill",
-                "terms": "sawmill,lumber"
+                "terms": "lumber"
             },
             "craft/scaffolder": {
                 "name": "Scaffolder",
-                "terms": "scaffolder"
+                "terms": ""
             },
             "craft/sculpter": {
                 "name": "Sculpter",
-                "terms": "sculpter"
+                "terms": ""
             },
             "craft/shoemaker": {
                 "name": "Shoemaker",
-                "terms": "shoe repair,shoemaker"
+                "terms": "cobbler"
             },
             "craft/stonemason": {
                 "name": "Stonemason",
-                "terms": "stonemason,masonry"
+                "terms": "masonry"
             },
             "craft/sweep": {
                 "name": "Chimney Sweep",
-                "terms": "sweep,chimney"
+                "terms": ""
             },
             "craft/tailor": {
                 "name": "Tailor",
-                "terms": "tailor,clothes"
+                "terms": "clothes,suit"
             },
             "craft/tiler": {
                 "name": "Tiler",
-                "terms": "tiler"
+                "terms": ""
             },
             "craft/tinsmith": {
                 "name": "Tinsmith",
-                "terms": "tinsmith"
+                "terms": ""
             },
             "craft/upholsterer": {
                 "name": "Upholsterer",
-                "terms": "upholsterer"
+                "terms": ""
             },
             "craft/watchmaker": {
                 "name": "Watchmaker",
-                "terms": "watch*"
+                "terms": ""
             },
             "craft/window_construction": {
                 "name": "Window Construction",
-                "terms": "window*"
+                "terms": "glass"
+            },
+            "craft/winery": {
+                "name": "Winery",
+                "terms": ""
             },
             "embankment": {
                 "name": "Embankment",
@@ -1923,7 +1934,7 @@
             },
             "emergency/ambulance_station": {
                 "name": "Ambulance Station",
-                "terms": ""
+                "terms": "EMS,EMT,rescue"
             },
             "emergency/fire_hydrant": {
                 "name": "Fire Hydrant",
@@ -1943,7 +1954,7 @@
             },
             "footway/crosswalk": {
                 "name": "Crosswalk",
-                "terms": "crosswalk,zebra crossing"
+                "terms": "zebra crossing"
             },
             "footway/sidewalk": {
                 "name": "Sidewalk",
@@ -1963,7 +1974,7 @@
             },
             "golf/green": {
                 "name": "Putting Green",
-                "terms": "putting green"
+                "terms": ""
             },
             "golf/hole": {
                 "name": "Golf Hole",
@@ -1991,7 +2002,7 @@
             },
             "highway/bridleway": {
                 "name": "Bridle Path",
-                "terms": "bridleway,equestrian trail,horse riding path,bridle road,horse trail"
+                "terms": "bridleway,equestrian,horse"
             },
             "highway/bus_stop": {
                 "name": "Bus Stop",
@@ -2003,15 +2014,15 @@
             },
             "highway/crosswalk": {
                 "name": "Crosswalk",
-                "terms": "crosswalk,zebra crossing"
+                "terms": "zebra crossing"
             },
             "highway/cycleway": {
                 "name": "Cycle Path",
-                "terms": ""
+                "terms": "bike"
             },
             "highway/footway": {
                 "name": "Foot Path",
-                "terms": "beaten path,boulevard,clearing,course,cut*,drag*,footpath,highway,lane,line,orbit,passage,pathway,rail,rails,road,roadway,route,street,thoroughfare,trackway,trail,trajectory,walk"
+                "terms": "hike,hiking,trackway,trail,walk"
             },
             "highway/living_street": {
                 "name": "Living Street",
@@ -2035,7 +2046,7 @@
             },
             "highway/path": {
                 "name": "Path",
-                "terms": ""
+                "terms": "hike,hiking,trackway,trail,walk"
             },
             "highway/pedestrian": {
                 "name": "Pedestrian",
@@ -2059,7 +2070,7 @@
             },
             "highway/rest_area": {
                 "name": "Rest Area",
-                "terms": "rest stop,turnout,lay-by"
+                "terms": "rest stop"
             },
             "highway/road": {
                 "name": "Unknown Road",
@@ -2123,7 +2134,7 @@
             },
             "highway/track": {
                 "name": "Track",
-                "terms": ""
+                "terms": "woods road,fire road"
             },
             "highway/traffic_signals": {
                 "name": "Traffic Signals",
@@ -2139,7 +2150,7 @@
             },
             "highway/turning_circle": {
                 "name": "Turning Circle",
-                "terms": ""
+                "terms": "cul-de-sac"
             },
             "highway/unclassified": {
                 "name": "Unclassified Road",
@@ -2295,7 +2306,7 @@
             },
             "leisure/marina": {
                 "name": "Marina",
-                "terms": ""
+                "terms": "boat"
             },
             "leisure/park": {
                 "name": "Park",
@@ -2303,11 +2314,11 @@
             },
             "leisure/picnic_table": {
                 "name": "Picnic Table",
-                "terms": "bench,table"
+                "terms": "bench"
             },
             "leisure/pitch": {
                 "name": "Sport Pitch",
-                "terms": ""
+                "terms": "field"
             },
             "leisure/pitch/american_football": {
                 "name": "American Football Field",
@@ -2347,7 +2358,7 @@
             },
             "leisure/slipway": {
                 "name": "Slipway",
-                "terms": ""
+                "terms": "boat launch,boat ramp"
             },
             "leisure/sports_center": {
                 "name": "Sports Center / Gym",
@@ -2767,20 +2778,44 @@
             },
             "shop/alcohol": {
                 "name": "Liquor Store",
-                "terms": "alcohol"
+                "terms": "alcohol,beer,booze,wine"
+            },
+            "shop/anime": {
+                "name": "Anime Shop",
+                "terms": ""
+            },
+            "shop/antiques": {
+                "name": "Antiques Shop",
+                "terms": ""
             },
             "shop/art": {
-                "name": "Art Shop",
-                "terms": "art*"
+                "name": "Art Gallery",
+                "terms": ""
+            },
+            "shop/baby_goods": {
+                "name": "Baby Goods Store",
+                "terms": ""
+            },
+            "shop/bag": {
+                "name": "Bag/Luggage Store",
+                "terms": "handbag,purse"
             },
             "shop/bakery": {
                 "name": "Bakery",
                 "terms": ""
             },
+            "shop/bathroom_furnishing": {
+                "name": "Bathroom Furnishing Store",
+                "terms": ""
+            },
             "shop/beauty": {
                 "name": "Beauty Shop",
                 "terms": "nail spa,spa,salon,tanning"
             },
+            "shop/bed": {
+                "name": "Bedding/Mattress Store",
+                "terms": ""
+            },
             "shop/beverages": {
                 "name": "Beverage Store",
                 "terms": ""
@@ -2794,7 +2829,7 @@
                 "terms": ""
             },
             "shop/books": {
-                "name": "Bookstore",
+                "name": "Book Store",
                 "terms": ""
             },
             "shop/boutique": {
@@ -2803,24 +2838,40 @@
             },
             "shop/butcher": {
                 "name": "Butcher",
+                "terms": "meat"
+            },
+            "shop/candles": {
+                "name": "Candle Shop",
                 "terms": ""
             },
             "shop/car": {
                 "name": "Car Dealership",
-                "terms": ""
+                "terms": "auto"
             },
             "shop/car_parts": {
                 "name": "Car Parts Store",
-                "terms": ""
+                "terms": "auto"
             },
             "shop/car_repair": {
                 "name": "Car Repair Shop",
+                "terms": "auto"
+            },
+            "shop/carpet": {
+                "name": "Carpet Store",
+                "terms": "rug"
+            },
+            "shop/cheese": {
+                "name": "Cheese Store",
                 "terms": ""
             },
             "shop/chemist": {
                 "name": "Chemist",
                 "terms": ""
             },
+            "shop/chocolate": {
+                "name": "Chocolate Store",
+                "terms": ""
+            },
             "shop/clothes": {
                 "name": "Clothing Store",
                 "terms": ""
@@ -2830,16 +2881,36 @@
                 "terms": ""
             },
             "shop/confectionery": {
-                "name": "Confectionery",
+                "name": "Candy Store",
                 "terms": ""
             },
             "shop/convenience": {
                 "name": "Convenience Store",
                 "terms": ""
             },
+            "shop/copyshop": {
+                "name": "Copy Store",
+                "terms": ""
+            },
+            "shop/cosmetics": {
+                "name": "Cosmetics Store",
+                "terms": ""
+            },
+            "shop/craft": {
+                "name": "Arts and Crafts Store",
+                "terms": ""
+            },
+            "shop/curtain": {
+                "name": "Curtain Store",
+                "terms": "drape*,window"
+            },
+            "shop/dairy": {
+                "name": "Dairy Store",
+                "terms": "milk,egg,cheese"
+            },
             "shop/deli": {
                 "name": "Deli",
-                "terms": ""
+                "terms": "lunch,meat,sandwich"
             },
             "shop/department_store": {
                 "name": "Department Store",
@@ -2850,36 +2921,56 @@
                 "terms": ""
             },
             "shop/dry_cleaning": {
-                "name": "Dry Cleaners",
+                "name": "Dry Cleaner",
                 "terms": ""
             },
             "shop/electronics": {
                 "name": "Electronics Store",
-                "terms": ""
+                "terms": "appliance,audio,computer,tv"
+            },
+            "shop/erotic": {
+                "name": "Erotic Store",
+                "terms": "sex,porn"
+            },
+            "shop/fabric": {
+                "name": "Fabric Store",
+                "terms": "sew"
             },
             "shop/farm": {
                 "name": "Produce Stand",
                 "terms": "farm shop,farm stand"
             },
+            "shop/fashion": {
+                "name": "Fashion Store",
+                "terms": ""
+            },
             "shop/fishmonger": {
                 "name": "Fishmonger",
                 "terms": ""
             },
             "shop/florist": {
                 "name": "Florist",
+                "terms": "flower"
+            },
+            "shop/frame": {
+                "name": "Framing Shop",
                 "terms": ""
             },
             "shop/funeral_directors": {
                 "name": "Funeral Home",
-                "terms": "undertaker,funeral parlour,funeral parlor,memorial home"
+                "terms": "undertaker,memorial home"
+            },
+            "shop/furnace": {
+                "name": "Furnace Store",
+                "terms": "oven,stove"
             },
             "shop/furniture": {
                 "name": "Furniture Store",
-                "terms": ""
+                "terms": "chair,sofa,table"
             },
             "shop/garden_centre": {
                 "name": "Garden Center",
-                "terms": "garden centre"
+                "terms": "landscape,mulch,shrub,tree"
             },
             "shop/gift": {
                 "name": "Gift Shop",
@@ -2887,7 +2978,7 @@
             },
             "shop/greengrocer": {
                 "name": "Greengrocer",
-                "terms": ""
+                "terms": "fruit,vegetable"
             },
             "shop/hairdresser": {
                 "name": "Hairdresser",
@@ -2897,25 +2988,45 @@
                 "name": "Hardware Store",
                 "terms": ""
             },
+            "shop/hearing_aids": {
+                "name": "Hearing Aids Store",
+                "terms": ""
+            },
+            "shop/herbalist": {
+                "name": "Herbalist",
+                "terms": ""
+            },
             "shop/hifi": {
                 "name": "Hifi Store",
+                "terms": "stereo,video"
+            },
+            "shop/interior_decoration": {
+                "name": "Interior Decoration Store",
                 "terms": ""
             },
             "shop/jewelry": {
                 "name": "Jeweler",
-                "terms": ""
+                "terms": "diamond,gem,ring"
             },
             "shop/kiosk": {
-                "name": "Kiosk",
+                "name": "News Kiosk",
+                "terms": ""
+            },
+            "shop/kitchen": {
+                "name": "Kitchen Design Store",
                 "terms": ""
             },
             "shop/laundry": {
                 "name": "Laundry",
                 "terms": ""
             },
+            "shop/leather": {
+                "name": "Leather Store",
+                "terms": ""
+            },
             "shop/locksmith": {
                 "name": "Locksmith",
-                "terms": "key*,lock*"
+                "terms": "key,lockpick"
             },
             "shop/lottery": {
                 "name": "Lottery Shop",
@@ -2925,42 +3036,90 @@
                 "name": "Mall",
                 "terms": ""
             },
+            "shop/massage": {
+                "name": "Massage Shop",
+                "terms": ""
+            },
+            "shop/medical_supply": {
+                "name": "Medical Supply Store",
+                "terms": ""
+            },
             "shop/mobile_phone": {
                 "name": "Mobile Phone Store",
                 "terms": ""
             },
+            "shop/money_lender": {
+                "name": "Money Lender",
+                "terms": ""
+            },
             "shop/motorcycle": {
                 "name": "Motorcycle Dealership",
                 "terms": ""
             },
             "shop/music": {
                 "name": "Music Store",
+                "terms": "CD,vinyl"
+            },
+            "shop/musical_instrument": {
+                "name": "Musical Instrument Store",
                 "terms": ""
             },
             "shop/newsagent": {
-                "name": "Newsagent",
+                "name": "Newspaper/Magazine Shop",
                 "terms": ""
             },
             "shop/optician": {
                 "name": "Optician",
+                "terms": "eye,glasses"
+            },
+            "shop/organic": {
+                "name": "Organic Goods Store",
                 "terms": ""
             },
             "shop/outdoor": {
-                "name": "Outdoor Store",
+                "name": "Outdoors Store",
+                "terms": "camping,climbing,hiking"
+            },
+            "shop/paint": {
+                "name": "Paint Store",
+                "terms": ""
+            },
+            "shop/pawnbroker": {
+                "name": "Pawn Shop",
                 "terms": ""
             },
             "shop/pet": {
                 "name": "Pet Store",
-                "terms": ""
+                "terms": "cat,dog,fish"
             },
             "shop/photo": {
                 "name": "Photography Store",
+                "terms": "camera,film"
+            },
+            "shop/pyrotechnics": {
+                "name": "Fireworks Store",
+                "terms": ""
+            },
+            "shop/radiotechnics": {
+                "name": "Radio/Electronic Component Store",
+                "terms": ""
+            },
+            "shop/religion": {
+                "name": "Religious Store",
+                "terms": ""
+            },
+            "shop/scuba_diving": {
+                "name": "Scuba Diving Shop",
                 "terms": ""
             },
             "shop/seafood": {
                 "name": "Seafood Shop",
                 "terms": "fishmonger"
             },
+            "shop/second_hand": {
+                "name": "Consignment/Thrift Store",
+                "terms": "secondhand,second hand,resale,thrift,used"
+            },
             "shop/shoes": {
                 "name": "Shoe Store",
                 "terms": ""
@@ -2971,15 +3130,31 @@
             },
             "shop/stationery": {
                 "name": "Stationery Store",
-                "terms": ""
+                "terms": "card,paper"
             },
             "shop/supermarket": {
                 "name": "Supermarket",
-                "terms": "bazaar,boutique,chain,co-op,cut-rate store,discount store,five-and-dime,flea market,galleria,grocery store,mall,mart,outlet,outlet store,shop,shopping center,shopping centre,shopping plaza,stand,store,supermarket,thrift shop"
+                "terms": "grocery,store,shop"
             },
             "shop/tailor": {
                 "name": "Tailor",
-                "terms": "tailor,clothes"
+                "terms": "clothes,suit"
+            },
+            "shop/tattoo": {
+                "name": "Tattoo Parlor",
+                "terms": ""
+            },
+            "shop/tea": {
+                "name": "Tea Store",
+                "terms": ""
+            },
+            "shop/ticket": {
+                "name": "Ticket Seller",
+                "terms": ""
+            },
+            "shop/tobacco": {
+                "name": "Tobacco Shop",
+                "terms": ""
             },
             "shop/toys": {
                 "name": "Toy Store",
@@ -2997,17 +3172,37 @@
                 "name": "Vacant Shop",
                 "terms": ""
             },
+            "shop/vacuum_cleaner": {
+                "name": "Vacuum Cleaner Store",
+                "terms": ""
+            },
             "shop/variety_store": {
                 "name": "Variety Store",
                 "terms": ""
             },
             "shop/video": {
                 "name": "Video Store",
+                "terms": "DVD"
+            },
+            "shop/video_games": {
+                "name": "Video Game Store",
+                "terms": ""
+            },
+            "shop/water_sports": {
+                "name": "Watersport/Swim Shop",
+                "terms": ""
+            },
+            "shop/weapons": {
+                "name": "Weapon Shop",
+                "terms": "ammo,gun,knife,knives"
+            },
+            "shop/window_blind": {
+                "name": "Window Blind Store",
                 "terms": ""
             },
             "shop/wine": {
                 "name": "Wine Shop",
-                "terms": "winery"
+                "terms": ""
             },
             "tourism": {
                 "name": "Tourism",
@@ -3027,7 +3222,7 @@
             },
             "tourism/camp_site": {
                 "name": "Camp Site",
-                "terms": "camping"
+                "terms": ""
             },
             "tourism/caravan_site": {
                 "name": "RV Park",
@@ -3039,7 +3234,7 @@
             },
             "tourism/guest_house": {
                 "name": "Guest House",
-                "terms": "B&B,Bed & Breakfast,Bed and Breakfast"
+                "terms": "B&B,Bed and Breakfast"
             },
             "tourism/hostel": {
                 "name": "Hostel",
@@ -3059,11 +3254,11 @@
             },
             "tourism/museum": {
                 "name": "Museum",
-                "terms": "exhibition,exhibits archive,foundation,gallery,hall,institution,library,menagerie,repository,salon,storehouse,treasury,vault"
+                "terms": "exhibition,foundation,gallery,hall,institution"
             },
             "tourism/picnic_site": {
                 "name": "Picnic Site",
-                "terms": ""
+                "terms": "camp"
             },
             "tourism/theme_park": {
                 "name": "Theme Park",