diff --git a/css/map.css b/css/map.css
index f8615d4a1..8c013fbec 100644
--- a/css/map.css
+++ b/css/map.css
@@ -210,26 +210,27 @@ path.fill.tag-natural-water {
     background-color: rgba(119, 211, 222, 0.3);
 }
 
-path.stroke.tag-amenity-school {
-    stroke: rgb(255, 255, 148);
-}
-path.fill.tag-amenity-school {
-    fill: rgba(255, 255, 148, 0.2);
-}
-.preset-icon-fill-area.tag-amenity-school {
-    border-color: rgb(255, 255, 148);
-    background-color: rgba(255, 255, 148, 0.2);
-}
-
+path.stroke.tag-amenity-childcare,
+path.stroke.tag-amenity-kindergarten,
+path.stroke.tag-amenity-school,
+path.stroke.tag-amenity-college,
 path.stroke.tag-amenity-university {
     stroke: rgb(255, 255, 148);
 }
+path.fill.tag-amenity-childcare,
+path.fill.tag-amenity-kindergarten,
+path.fill.tag-amenity-school,
+path.fill.tag-amenity-college,
 path.fill.tag-amenity-university {
-    fill: rgba(255, 255, 148, 0.1);
+    fill: rgba(255, 255, 148, 0.15);
 }
+.preset-icon-fill-area.tag-amenity-childcare,
+.preset-icon-fill-area.tag-amenity-kindergarten,
+.preset-icon-fill-area.tag-amenity-school,
+.preset-icon-fill-area.tag-amenity-college,
 .preset-icon-fill-area.tag-amenity-university {
     border-color: rgb(255, 255, 148);
-    background-color: rgba(255, 255, 148, 0.1);
+    background-color: rgba(255, 255, 148, 0.15);
 }
 
 path.stroke.tag-landuse,
diff --git a/data/presets.yaml b/data/presets.yaml
index 6145a17a6..c2d542de4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -658,8 +658,8 @@ en:
         name: Charging Station
         terms: "<translate with synonyms or related terms for 'Charging Station', separated by commas>"
       amenity/childcare:
-        name: Childcare
-        terms: "<translate with synonyms or related terms for 'Childcare', separated by commas>"
+        name: Nursery/Childcare
+        terms: "<translate with synonyms or related terms for 'Nursery/Childcare', separated by commas>"
       amenity/cinema:
         name: Cinema
         terms: "<translate with synonyms or related terms for 'Cinema', separated by commas>"
@@ -670,8 +670,8 @@ en:
         name: Clock
         terms: "<translate with synonyms or related terms for 'Clock', separated by commas>"
       amenity/college:
-        name: College
-        terms: "<translate with synonyms or related terms for 'College', separated by commas>"
+        name: College Grounds
+        terms: "<translate with synonyms or related terms for 'College Grounds', separated by commas>"
       amenity/compressed_air:
         name: Compressed Air
         terms: "<translate with synonyms or related terms for 'Compressed Air', separated by commas>"
@@ -712,8 +712,8 @@ en:
         name: Hospital Grounds
         terms: "<translate with synonyms or related terms for 'Hospital Grounds', separated by commas>"
       amenity/kindergarten:
-        name: Kindergarten Grounds
-        terms: "<translate with synonyms or related terms for 'Kindergarten Grounds', separated by commas>"
+        name: Preschool/Kindergarten Grounds
+        terms: "<translate with synonyms or related terms for 'Preschool/Kindergarten Grounds', separated by commas>"
       amenity/library:
         name: Library
         terms: "<translate with synonyms or related terms for 'Library', separated by commas>"
@@ -781,8 +781,8 @@ en:
         name: Food Bank
         terms: "<translate with synonyms or related terms for 'Food Bank', separated by commas>"
       amenity/social_facility/group_home:
-        name: Group Home
-        terms: "<translate with synonyms or related terms for 'Group Home', separated by commas>"
+        name: Elderly Group Home
+        terms: "<translate with synonyms or related terms for 'Elderly Group Home', separated by commas>"
       amenity/social_facility/homeless_shelter:
         name: Homeless Shelter
         terms: "<translate with synonyms or related terms for 'Homeless Shelter', separated by commas>"
@@ -808,8 +808,8 @@ en:
         name: Town Hall
         terms: "<translate with synonyms or related terms for 'Town Hall', separated by commas>"
       amenity/university:
-        name: University
-        terms: "<translate with synonyms or related terms for 'University', separated by commas>"
+        name: University Grounds
+        terms: "<translate with synonyms or related terms for 'University Grounds', separated by commas>"
       amenity/vending_machine:
         name: Vending Machine
         terms: "<translate with synonyms or related terms for 'Vending Machine', separated by commas>"
@@ -900,6 +900,9 @@ en:
       building/church:
         name: Church
         terms: "<translate with synonyms or related terms for 'Church', separated by commas>"
+      building/college:
+        name: College Building
+        terms: "<translate with synonyms or related terms for 'College Building', separated by commas>"
       building/commercial:
         name: Commercial Building
         terms: "<translate with synonyms or related terms for 'Commercial Building', separated by commas>"
@@ -939,6 +942,9 @@ en:
       building/industrial:
         name: Industrial Building
         terms: "<translate with synonyms or related terms for 'Industrial Building', separated by commas>"
+      building/kindergarten:
+        name: Preschool/Kindergarten Building
+        terms: "<translate with synonyms or related terms for 'Preschool/Kindergarten Building', separated by commas>"
       building/public:
         name: Public Building
         terms: "<translate with synonyms or related terms for 'Public Building', separated by commas>"
@@ -1489,8 +1495,8 @@ en:
         name: Water Tower
         terms: "<translate with synonyms or related terms for 'Water Tower', separated by commas>"
       man_made/water_well:
-        name: Water well
-        terms: "<translate with synonyms or related terms for 'Water well', separated by commas>"
+        name: Water Well
+        terms: "<translate with synonyms or related terms for 'Water Well', separated by commas>"
       man_made/water_works:
         name: Water Works
         terms: "<translate with synonyms or related terms for 'Water Works', separated by commas>"
diff --git a/data/presets/README.md b/data/presets/README.md
index ed3c0469a..569e8e55a 100644
--- a/data/presets/README.md
+++ b/data/presets/README.md
@@ -15,8 +15,13 @@ A basic preset is of the form:
 
 ```javascript
 {
-    "name": "park",
-    // the geometry types for which this preset is valid.
+    // The icon in iD which represents this feature.
+    "icon": "park",
+    // An array of field names. See the fields documentation for details of what's valid here.
+    "fields": [
+        "address"
+    ],
+    // The geometry types for which this preset is valid.
     // options are point, area, line, and vertex.
     // vertexes are points that are parts of lines, like the nodes
     // in a road
@@ -24,7 +29,7 @@ A basic preset is of the form:
     "geometry": [
         "point", "area"
     ],
-    // terms are synonyms for the preset - these are added to fuel
+    // Terms are synonyms for the preset - these are added to fuel
     // the search functionality. searching for 'woodland' will bring
     // up this 'park' preset
     "terms": [
@@ -32,18 +37,14 @@ A basic preset is of the form:
         "village green",
         "woodland"
     ],
-    // tags that are added to the feature when selecting the preset,
+    // Tags that are added to the feature when selecting the preset,
     // and also used to match the preset against existing features.
     // You can use the value "*" to match any value.
     "tags": {
         "leisure": "park"
     },
-    // the icon in iD which represents this feature
-    "icon": "park",
-    // An array of field names. See the fields documentation for details of what's valid here.
-    "fields": [
-        "address"
-    ]
+    // English language display name for this map feature.
+    "name": "Park"
 }
 ```
 
@@ -78,10 +79,10 @@ extension).
 
 ## Icons
 
-Preset icons in iD are pulled from the open source POI icon set, 
+Preset icons in iD are pulled from the open source POI icon set,
 [Maki](http://www.mapbox.com/maki/). Icons are stored in `dist/img/maki-sprite.png`.
-The icons are identified in iD by the same name as they are on the Maki home. Use those 
-names when identifying the icon to be used for a given preset. 
+The icons are identified in iD by the same name as they are on the Maki home. Use those
+names when identifying the icon to be used for a given preset.
 
 ## Building
 
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7097ae76e..9c43a7931 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -335,23 +335,23 @@
         "name": "Amenity"
     },
     "amenity/arts_centre": {
-        "name": "Arts Center",
+        "icon": "theatre",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "arts",
-            "arts centre"
+            "art*"
         ],
         "tags": {
             "amenity": "arts_centre"
         },
-        "icon": "theatre",
-        "fields": [
-            "building_area",
-            "address"
-        ]
+        "name": "Arts Center"
     },
     "amenity/atm": {
         "icon": "bank",
@@ -371,8 +371,9 @@
         "icon": "bank",
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -411,8 +412,8 @@
     "amenity/bar": {
         "icon": "bar",
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -446,6 +447,9 @@
         "name": "Barbecue/Grill"
     },
     "amenity/bench": {
+        "fields": [
+            "backrest"
+        ],
         "geometry": [
             "point",
             "vertex",
@@ -454,9 +458,6 @@
         "tags": {
             "amenity": "bench"
         },
-        "fields": [
-            "backrest"
-        ],
         "name": "Bench"
     },
     "amenity/bicycle_parking": {
@@ -496,6 +497,9 @@
         "name": "Bicycle Rental"
     },
     "amenity/boat_rental": {
+        "fields": [
+            "operator"
+        ],
         "geometry": [
             "point",
             "area"
@@ -503,9 +507,6 @@
         "tags": {
             "amenity": "boat_rental"
         },
-        "fields": [
-            "operator"
-        ],
         "name": "Boat Rental"
     },
     "amenity/bureau_de_change": {
@@ -544,8 +545,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -566,6 +567,9 @@
     },
     "amenity/car_rental": {
         "icon": "car",
+        "fields": [
+            "operator"
+        ],
         "geometry": [
             "point",
             "area"
@@ -573,13 +577,14 @@
         "tags": {
             "amenity": "car_rental"
         },
-        "fields": [
-            "operator"
-        ],
         "name": "Car Rental"
     },
     "amenity/car_sharing": {
         "icon": "car",
+        "fields": [
+            "operator",
+            "capacity"
+        ],
         "geometry": [
             "point",
             "area"
@@ -587,14 +592,15 @@
         "tags": {
             "amenity": "car_sharing"
         },
-        "fields": [
-            "operator",
-            "capacity"
-        ],
         "name": "Car Sharing"
     },
     "amenity/car_wash": {
         "icon": "car",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -602,13 +608,13 @@
         "tags": {
             "amenity": "car_wash"
         },
-        "fields": [
-            "building_area"
-        ],
         "name": "Car Wash"
     },
     "amenity/charging_station": {
         "icon": "car",
+        "fields": [
+            "operator"
+        ],
         "geometry": [
             "point",
             "area"
@@ -616,9 +622,6 @@
         "tags": {
             "amenity": "charging_station"
         },
-        "fields": [
-            "operator"
-        ],
         "terms": [
             "EV",
             "Electric Vehicle",
@@ -629,8 +632,10 @@
     "amenity/childcare": {
         "icon": "school",
         "fields": [
+            "operator",
+            "address",
             "building_area",
-            "address"
+            "opening_hours"
         ],
         "geometry": [
             "point",
@@ -638,6 +643,7 @@
             "area"
         ],
         "terms": [
+            "daycare",
             "nursery",
             "orphanage",
             "playgroup"
@@ -645,13 +651,14 @@
         "tags": {
             "amenity": "childcare"
         },
-        "name": "Childcare"
+        "name": "Nursery/Childcare"
     },
     "amenity/cinema": {
         "icon": "cinema",
         "fields": [
+            "address",
             "building_area",
-            "address"
+            "opening_hours"
         ],
         "geometry": [
             "point",
@@ -683,7 +690,12 @@
         "name": "Cinema"
     },
     "amenity/clinic": {
-        "name": "Clinic",
+        "icon": "hospital",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -695,12 +707,7 @@
         "tags": {
             "amenity": "clinic"
         },
-        "icon": "hospital",
-        "fields": [
-            "building_area",
-            "address",
-            "opening_hours"
-        ]
+        "name": "Clinic"
     },
     "amenity/clock": {
         "geometry": [
@@ -722,11 +729,14 @@
             "point",
             "area"
         ],
+        "terms": [
+            "college",
+            "university"
+        ],
         "tags": {
             "amenity": "college"
         },
-        "terms": [],
-        "name": "College"
+        "name": "College Grounds"
     },
     "amenity/compressed_air": {
         "icon": "car",
@@ -740,10 +750,11 @@
         "name": "Compressed Air"
     },
     "amenity/courthouse": {
+        "icon": "town-hall",
         "fields": [
             "operator",
-            "building_area",
-            "address"
+            "address",
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -756,47 +767,54 @@
         "name": "Courthouse"
     },
     "amenity/dentist": {
-        "name": "Dentist",
+        "icon": "hospital",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "dentist",
-            "dentist's office"
+            "dentist*",
+            "tooth",
+            "teeth"
         ],
         "tags": {
             "amenity": "dentist"
         },
-        "icon": "hospital",
-        "fields": [
-            "building_area",
-            "address",
-            "opening_hours"
-        ]
+        "name": "Dentist"
     },
     "amenity/doctor": {
-        "name": "Doctor",
+        "icon": "hospital",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "doctor",
-            "doctor's office"
+            "doctor*",
+            "medic*"
         ],
         "tags": {
             "amenity": "doctors"
         },
-        "icon": "hospital",
-        "fields": [
-            "building_area",
-            "address",
-            "opening_hours"
-        ]
+        "name": "Doctor"
     },
     "amenity/dojo": {
         "icon": "pitch",
+        "fields": [
+            "sport",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -809,10 +827,6 @@
         "tags": {
             "amenity": "dojo"
         },
-        "fields": [
-            "address",
-            "sport"
-        ],
         "name": "Dojo / Martial Arts Academy"
     },
     "amenity/drinking_water": {
@@ -830,6 +844,12 @@
         "name": "Drinking Water"
     },
     "amenity/embassy": {
+        "icon": "embassy",
+        "fields": [
+            "country",
+            "address",
+            "building_area"
+        ],
         "geometry": [
             "area",
             "point"
@@ -837,19 +857,15 @@
         "tags": {
             "amenity": "embassy"
         },
-        "fields": [
-            "country",
-            "building_area"
-        ],
-        "icon": "embassy",
         "name": "Embassy"
     },
     "amenity/fast_food": {
         "icon": "fast-food",
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -868,8 +884,8 @@
         "icon": "fire-station",
         "fields": [
             "operator",
-            "building_area",
-            "address"
+            "address",
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -897,7 +913,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "geometry": [
             "point",
@@ -968,28 +985,30 @@
     "amenity/kindergarten": {
         "icon": "school",
         "fields": [
+            "operator",
             "address"
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
-            "nursery",
+            "kindergarten",
+            "kindergarden",
             "preschool"
         ],
         "tags": {
             "amenity": "kindergarten"
         },
-        "name": "Kindergarten Grounds"
+        "name": "Preschool/Kindergarten Grounds"
     },
     "amenity/library": {
         "icon": "library",
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "geometry": [
             "point",
@@ -1003,6 +1022,11 @@
         "name": "Library"
     },
     "amenity/marketplace": {
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "vertex",
@@ -1011,16 +1035,13 @@
         "tags": {
             "amenity": "marketplace"
         },
-        "fields": [
-            "building_area"
-        ],
         "name": "Marketplace"
     },
     "amenity/nightclub": {
         "icon": "bar",
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -1080,8 +1101,8 @@
         "icon": "pharmacy",
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -1092,7 +1113,10 @@
         "tags": {
             "amenity": "pharmacy"
         },
-        "terms": [],
+        "terms": [
+            "drug",
+            "medicine"
+        ],
         "name": "Pharmacy"
     },
     "amenity/place_of_worship": {
@@ -1100,8 +1124,8 @@
         "fields": [
             "religion",
             "denomination",
-            "building_area",
-            "address"
+            "address",
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -1255,8 +1279,8 @@
         "icon": "police",
         "fields": [
             "operator",
-            "building_area",
-            "address"
+            "address",
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -1325,8 +1349,9 @@
         "icon": "post",
         "fields": [
             "operator",
-            "collection_times",
-            "building_area"
+            "address",
+            "building_area",
+            "collection_times"
         ],
         "geometry": [
             "point",
@@ -1341,8 +1366,8 @@
     "amenity/pub": {
         "icon": "beer",
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -1359,10 +1384,10 @@
     },
     "amenity/ranger_station": {
         "fields": [
-            "building_area",
-            "opening_hours",
             "operator",
-            "phone"
+            "address",
+            "building_area",
+            "opening_hours"
         ],
         "geometry": [
             "point",
@@ -1385,6 +1410,8 @@
     "amenity/recycling": {
         "icon": "recycling",
         "fields": [
+            "operator",
+            "address",
             "recycling/cans",
             "recycling/glass",
             "recycling/paper",
@@ -1405,8 +1432,8 @@
         "icon": "restaurant",
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -1463,26 +1490,11 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
         "terms": [
             "academy",
-            "alma mater",
-            "blackboard",
-            "college",
-            "department",
-            "discipline",
-            "establishment",
-            "faculty",
-            "hall",
-            "halls of ivy",
-            "institute",
-            "institution",
-            "jail*",
-            "schoolhouse",
-            "seminary",
-            "university"
+            "school*"
         ],
         "tags": {
             "amenity": "school"
@@ -1507,7 +1519,14 @@
         "name": "Shelter"
     },
     "amenity/social_facility": {
-        "name": "Social Facility",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours",
+            "wheelchair",
+            "social_facility_for"
+        ],
         "geometry": [
             "point",
             "area"
@@ -1516,17 +1535,16 @@
         "tags": {
             "amenity": "social_facility"
         },
-        "fields": [
-            "social_facility_for",
-            "address",
-            "phone",
-            "opening_hours",
-            "wheelchair",
-            "operator"
-        ]
+        "name": "Social Facility"
     },
     "amenity/social_facility/food_bank": {
-        "name": "Food Bank",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours",
+            "social_facility_for"
+        ],
         "geometry": [
             "point",
             "area"
@@ -1536,17 +1554,17 @@
             "amenity": "social_facility",
             "social_facility": "food_bank"
         },
-        "fields": [
-            "social_facility_for",
-            "address",
-            "phone",
-            "opening_hours",
-            "wheelchair",
-            "operator"
-        ]
+        "name": "Food Bank"
     },
     "amenity/social_facility/group_home": {
-        "name": "Group Home",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours",
+            "wheelchair",
+            "social_facility_for"
+        ],
         "geometry": [
             "point",
             "area"
@@ -1561,17 +1579,17 @@
             "social_facility": "group_home",
             "social_facility_for": "senior"
         },
-        "fields": [
-            "social_facility_for",
-            "address",
-            "phone",
-            "opening_hours",
-            "wheelchair",
-            "operator"
-        ]
+        "name": "Elderly Group Home"
     },
     "amenity/social_facility/homeless_shelter": {
-        "name": "Homeless Shelter",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours",
+            "wheelchair",
+            "social_facility_for"
+        ],
         "geometry": [
             "point",
             "area"
@@ -1586,17 +1604,15 @@
             "social_facility": "shelter",
             "social_facility:for": "homeless"
         },
-        "fields": [
-            "social_facility_for",
-            "address",
-            "phone",
-            "opening_hours",
-            "wheelchair",
-            "operator"
-        ]
+        "name": "Homeless Shelter"
     },
     "amenity/studio": {
-        "name": "Studio",
+        "icon": "music",
+        "fields": [
+            "studio_type",
+            "address",
+            "building_area"
+        ],
         "geometry": [
             "point",
             "area"
@@ -1612,14 +1628,10 @@
         "tags": {
             "amenity": "studio"
         },
-        "icon": "music",
-        "fields": [
-            "building_area",
-            "studio_type",
-            "address"
-        ]
+        "name": "Studio"
     },
     "amenity/swimming_pool": {
+        "icon": "swimming",
         "geometry": [
             "point",
             "vertex",
@@ -1628,7 +1640,6 @@
         "tags": {
             "amenity": "swimming_pool"
         },
-        "icon": "swimming",
         "searchable": false,
         "name": "Swimming Pool"
     },
@@ -1668,8 +1679,8 @@
         "icon": "theatre",
         "fields": [
             "operator",
-            "building_area",
-            "address"
+            "address",
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -1720,8 +1731,8 @@
     "amenity/townhall": {
         "icon": "town-hall",
         "fields": [
-            "building_area",
-            "address"
+            "address",
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -1749,16 +1760,16 @@
         ],
         "geometry": [
             "point",
-            "vertex",
             "area"
         ],
+        "terms": [
+            "college",
+            "university"
+        ],
         "tags": {
             "amenity": "university"
         },
-        "terms": [
-            "college"
-        ],
-        "name": "University"
+        "name": "University Grounds"
     },
     "amenity/vending_machine": {
         "fields": [
@@ -1774,7 +1785,12 @@
         "name": "Vending Machine"
     },
     "amenity/veterinary": {
-        "fields": [],
+        "icon": "dog-park",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2154,6 +2170,26 @@
         },
         "name": "Church"
     },
+    "building/college": {
+        "icon": "building",
+        "fields": [
+            "address",
+            "levels"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [
+            "college",
+            "university"
+        ],
+        "tags": {
+            "building": "college"
+        },
+        "name": "College Building"
+    },
     "building/commercial": {
         "icon": "commercial",
         "fields": [
@@ -2351,6 +2387,27 @@
         },
         "name": "Industrial Building"
     },
+    "building/kindergarten": {
+        "icon": "building",
+        "fields": [
+            "address",
+            "levels"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [
+            "kindergarten",
+            "kindergarden",
+            "preschool"
+        ],
+        "tags": {
+            "building": "kindergarten"
+        },
+        "name": "Preschool/Kindergarten Building"
+    },
     "building/public": {
         "icon": "building",
         "fields": [
@@ -2428,6 +2485,10 @@
             "vertex",
             "area"
         ],
+        "terms": [
+            "academy",
+            "school*"
+        ],
         "tags": {
             "building": "school"
         },
@@ -2525,6 +2586,10 @@
             "vertex",
             "area"
         ],
+        "terms": [
+            "college",
+            "university"
+        ],
         "tags": {
             "building": "university"
         },
@@ -2547,52 +2612,53 @@
         "name": "Warehouse"
     },
     "craft/basket_maker": {
-        "name": "Basket Maker",
+        "icon": "art-gallery",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "basket",
-            "basketry",
-            "basket maker",
-            "basket weaver"
+            "basket*"
         ],
         "tags": {
             "craft": "basket_maker"
         },
-        "icon": "art-gallery",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Basket Maker"
     },
     "craft/beekeeper": {
-        "name": "Beekeeper",
+        "icon": "farm",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "bees",
-            "beekeeper",
-            "bee box"
+            "bee*"
         ],
         "tags": {
             "craft": "beekeeper"
         },
-        "icon": "farm",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Beekeeper"
     },
     "craft/blacksmith": {
-        "name": "Blacksmith",
+        "icon": "farm",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2603,16 +2669,16 @@
         "tags": {
             "craft": "blacksmith"
         },
-        "icon": "farm",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Blacksmith"
     },
     "craft/boatbuilder": {
-        "name": "Boat Builder",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2623,16 +2689,16 @@
         "tags": {
             "craft": "boatbuilder"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Boat Builder"
     },
     "craft/bookbinder": {
-        "name": "Bookbinder",
+        "icon": "library",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2644,16 +2710,16 @@
         "tags": {
             "craft": "bookbinder"
         },
-        "icon": "library",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Bookbinder"
     },
     "craft/brewery": {
-        "name": "Brewery",
+        "icon": "beer",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2664,16 +2730,16 @@
         "tags": {
             "craft": "brewery"
         },
-        "icon": "beer",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Brewery"
     },
     "craft/carpenter": {
-        "name": "Carpenter",
+        "icon": "logging",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2685,16 +2751,16 @@
         "tags": {
             "craft": "carpenter"
         },
-        "icon": "logging",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Carpenter"
     },
     "craft/carpet_layer": {
-        "name": "Carpet Layer",
+        "icon": "square",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2705,60 +2771,57 @@
         "tags": {
             "craft": "carpet_layer"
         },
-        "icon": "square",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Carpet Layer"
     },
     "craft/caterer": {
-        "name": "Caterer",
+        "icon": "bakery",
+        "fields": [
+            "cuisine",
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "Caterer",
-            "Catering"
+            "cater*"
         ],
         "tags": {
             "craft": "caterer"
         },
-        "icon": "bakery",
-        "fields": [
-            "cuisine",
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Caterer"
     },
     "craft/clockmaker": {
-        "name": "Clockmaker",
+        "icon": "circle-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "clock",
-            "clockmaker",
-            "clock repair"
+            "clock*"
         ],
         "tags": {
             "craft": "clockmaker"
         },
-        "icon": "circle-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Clockmaker"
     },
     "craft/confectionary": {
-        "name": "Confectionary",
+        "icon": "bakery",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2771,16 +2834,16 @@
         "tags": {
             "craft": "confectionary"
         },
-        "icon": "bakery",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Confectionary"
     },
     "craft/dressmaker": {
-        "name": "Dressmaker",
+        "icon": "clothing-store",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2792,16 +2855,16 @@
         "tags": {
             "craft": "dressmaker"
         },
-        "icon": "clothing-store",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Dressmaker"
     },
     "craft/electrician": {
-        "name": "Electrician",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2812,16 +2875,16 @@
         "tags": {
             "craft": "electrician"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Electrician"
     },
     "craft/gardener": {
-        "name": "Gardener",
+        "icon": "garden",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2834,16 +2897,16 @@
         "tags": {
             "craft": "gardener"
         },
-        "icon": "garden",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Gardener"
     },
     "craft/glaziery": {
-        "name": "Glaziery",
+        "icon": "fire-station",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2857,16 +2920,16 @@
         "tags": {
             "craft": "glaziery"
         },
-        "icon": "fire-station",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Glaziery"
     },
     "craft/handicraft": {
-        "name": "Handicraft",
+        "icon": "art-gallery",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2877,60 +2940,59 @@
         "tags": {
             "craft": "handicraft"
         },
-        "icon": "art-gallery",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Handicraft"
     },
     "craft/hvac": {
-        "name": "HVAC",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "heating",
-            "ventilating",
+            "heat*",
+            "vent*",
             "air-conditioning",
             "air conditioning"
         ],
         "tags": {
             "craft": "hvac"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "HVAC"
     },
     "craft/insulator": {
-        "name": "Insulator",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "insulation",
-            "insulator"
+            "insulat*"
         ],
         "tags": {
             "craft": "insulation"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Insulator"
     },
     "craft/jeweler": {
-        "name": "Jeweler",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -2943,60 +3005,58 @@
         "tags": {
             "craft": "jeweler"
         },
-        "icon": "marker-stroked",
-        "searchable": false,
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Jeweler",
+        "searchable": false
     },
     "craft/key_cutter": {
-        "name": "Key Cutter",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "key",
-            "key cutter"
+            "key*"
         ],
         "tags": {
             "craft": "key_cutter"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Key Cutter"
     },
     "craft/locksmith": {
-        "name": "Locksmith",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "locksmith",
-            "lock"
+            "lock*"
         ],
         "tags": {
             "craft": "locksmith"
         },
-        "icon": "marker-stroked",
-        "searchable": false,
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Locksmith",
+        "searchable": false
     },
     "craft/metal_construction": {
-        "name": "Metal Construction",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3007,16 +3067,16 @@
         "tags": {
             "craft": "metal_construction"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Metal Construction"
     },
     "craft/optician": {
-        "name": "Optician",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3028,17 +3088,17 @@
         "tags": {
             "craft": "optician"
         },
-        "icon": "marker-stroked",
-        "searchable": false,
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Optician",
+        "searchable": false
     },
     "craft/painter": {
-        "name": "Painter",
+        "icon": "art-gallery",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3049,16 +3109,16 @@
         "tags": {
             "craft": "painter"
         },
-        "icon": "art-gallery",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Painter"
     },
     "craft/photographer": {
-        "name": "Photographer",
+        "icon": "camera",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3069,37 +3129,37 @@
         "tags": {
             "craft": "photographer"
         },
-        "icon": "camera",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Photographer"
     },
     "craft/photographic_laboratory": {
-        "name": "Photographic Laboratory",
+        "icon": "camera",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "photographic laboratory",
-            "film developer"
+            "photo*",
+            "film"
         ],
         "tags": {
             "craft": "photographic_laboratory"
         },
-        "icon": "camera",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Photographic Laboratory"
     },
     "craft/plasterer": {
-        "name": "Plasterer",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3110,16 +3170,16 @@
         "tags": {
             "craft": "plasterer"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Plasterer"
     },
     "craft/plumber": {
-        "name": "Plumber",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3130,37 +3190,37 @@
         "tags": {
             "craft": "plumber"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Plumber"
     },
     "craft/pottery": {
-        "name": "Pottery",
+        "icon": "art-gallery",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "pottery",
-            "potter"
+            "potter*",
+            "ceramic*"
         ],
         "tags": {
             "craft": "pottery"
         },
-        "icon": "art-gallery",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Pottery"
     },
     "craft/rigger": {
-        "name": "Rigger",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3171,16 +3231,16 @@
         "tags": {
             "craft": "rigger"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Rigger"
     },
     "craft/roofer": {
-        "name": "Roofer",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3191,56 +3251,56 @@
         "tags": {
             "craft": "roofer"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Roofer"
     },
     "craft/saddler": {
-        "name": "Saddler",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "saddler"
+            "saddle*"
         ],
         "tags": {
             "craft": "saddler"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Saddler"
     },
     "craft/sailmaker": {
-        "name": "Sailmaker",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "sailmaker"
+            "sail*"
         ],
         "tags": {
             "craft": "sailmaker"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Sailmaker"
     },
     "craft/sawmill": {
-        "name": "Sawmill",
+        "icon": "park",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3252,16 +3312,16 @@
         "tags": {
             "craft": "sawmill"
         },
-        "icon": "park",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Sawmill"
     },
     "craft/scaffolder": {
-        "name": "Scaffolder",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3272,16 +3332,16 @@
         "tags": {
             "craft": "scaffolder"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Scaffolder"
     },
     "craft/sculpter": {
-        "name": "Sculpter",
+        "icon": "art-gallery",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3292,16 +3352,16 @@
         "tags": {
             "craft": "sculpter"
         },
-        "icon": "art-gallery",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Sculpter"
     },
     "craft/shoemaker": {
-        "name": "Shoemaker",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3313,16 +3373,16 @@
         "tags": {
             "craft": "shoemaker"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Shoemaker"
     },
     "craft/stonemason": {
-        "name": "Stonemason",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3334,37 +3394,37 @@
         "tags": {
             "craft": "stonemason"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Stonemason"
     },
     "craft/sweep": {
-        "name": "Chimney Sweep",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
             "sweep",
-            "chimney sweep"
+            "chimney"
         ],
         "tags": {
             "craft": "sweep"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Chimney Sweep"
     },
     "craft/tailor": {
-        "name": "Tailor",
+        "icon": "clothing-store",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3376,17 +3436,16 @@
         "tags": {
             "craft": "tailor"
         },
-        "icon": "clothing-store",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ],
-        "searchable": false
+        "name": "Tailor"
     },
     "craft/tiler": {
-        "name": "Tiler",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3397,16 +3456,16 @@
         "tags": {
             "craft": "tiler"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Tiler"
     },
     "craft/tinsmith": {
-        "name": "Tinsmith",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3417,16 +3476,16 @@
         "tags": {
             "craft": "tinsmith"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Tinsmith"
     },
     "craft/upholsterer": {
-        "name": "Upholsterer",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -3437,57 +3496,47 @@
         "tags": {
             "craft": "upholsterer"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Upholsterer"
     },
     "craft/watchmaker": {
-        "name": "Watchmaker",
+        "icon": "circle-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "watch",
-            "watchmaker",
-            "watch repair"
+            "watch*"
         ],
         "tags": {
             "craft": "watchmaker"
         },
-        "icon": "circle-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Watchmaker"
     },
     "craft/window_construction": {
-        "name": "Window Construction",
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
         ],
         "terms": [
-            "window",
-            "window maker",
-            "window construction"
+            "window*"
         ],
         "tags": {
             "craft": "window_construction"
         },
-        "icon": "marker-stroked",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "name": "Window Construction"
     },
     "embankment": {
         "geometry": [
@@ -3500,8 +3549,11 @@
         "matchScore": 0.2
     },
     "emergency/ambulance_station": {
+        "icon": "hospital",
         "fields": [
-            "operator"
+            "operator",
+            "building_area",
+            "address"
         ],
         "geometry": [
             "area",
@@ -4891,6 +4943,7 @@
         "name": "Common"
     },
     "leisure/dog_park": {
+        "icon": "dog-park",
         "geometry": [
             "point",
             "area"
@@ -4899,8 +4952,7 @@
         "tags": {
             "leisure": "dog_park"
         },
-        "name": "Dog Park",
-        "icon": "dog-park"
+        "name": "Dog Park"
     },
     "leisure/firepit": {
         "geometry": [
@@ -4932,26 +4984,30 @@
         "icon": "golf",
         "fields": [
             "operator",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "geometry": [
             "point",
             "area"
         ],
-        "tags": {
-            "leisure": "golf_course"
-        },
         "terms": [
             "links"
         ],
+        "tags": {
+            "leisure": "golf_course"
+        },
         "name": "Golf Course"
     },
     "leisure/ice_rink": {
         "icon": "pitch",
         "fields": [
-            "building_area",
             "seasonal",
-            "sport_ice"
+            "sport_ice",
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
         ],
         "geometry": [
             "point",
@@ -5167,14 +5223,14 @@
             "point",
             "area"
         ],
-        "tags": {
-            "leisure": "playground"
-        },
-        "name": "Playground",
         "terms": [
             "jungle gym",
             "play area"
-        ]
+        ],
+        "tags": {
+            "leisure": "playground"
+        },
+        "name": "Playground"
     },
     "leisure/running_track": {
         "icon": "pitch",
@@ -5207,6 +5263,12 @@
     },
     "leisure/sports_center": {
         "icon": "pitch",
+        "fields": [
+            "sport",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
             "area"
@@ -5217,13 +5279,14 @@
         "terms": [
             "gym"
         ],
-        "fields": [
-            "sport"
-        ],
         "name": "Sports Center / Gym"
     },
     "leisure/stadium": {
         "icon": "pitch",
+        "fields": [
+            "sport",
+            "address"
+        ],
         "geometry": [
             "point",
             "area"
@@ -5231,14 +5294,13 @@
         "tags": {
             "leisure": "stadium"
         },
-        "fields": [
-            "sport"
-        ],
         "name": "Stadium"
     },
     "leisure/swimming_pool": {
         "fields": [
-            "access_simple"
+            "access_simple",
+            "operator",
+            "address"
         ],
         "geometry": [
             "point",
@@ -5332,6 +5394,7 @@
         "icon": "embassy"
     },
     "man_made/lighthouse": {
+        "icon": "lighthouse",
         "geometry": [
             "point",
             "area"
@@ -5339,8 +5402,7 @@
         "tags": {
             "man_made": "lighthouse"
         },
-        "name": "Lighthouse",
-        "icon": "lighthouse"
+        "name": "Lighthouse"
     },
     "man_made/observation": {
         "geometry": [
@@ -5368,21 +5430,24 @@
         "name": "Pier"
     },
     "man_made/pipeline": {
+        "icon": "pipeline",
+        "fields": [
+            "location",
+            "operator"
+        ],
         "geometry": [
             "line"
         ],
         "tags": {
             "man_made": "pipeline"
         },
-        "fields": [
-            "location",
-            "operator"
-        ],
-        "name": "Pipeline",
-        "icon": "pipeline"
+        "name": "Pipeline"
     },
     "man_made/survey_point": {
         "icon": "monument",
+        "fields": [
+            "ref"
+        ],
         "geometry": [
             "point",
             "vertex"
@@ -5390,12 +5455,12 @@
         "tags": {
             "man_made": "survey_point"
         },
-        "fields": [
-            "ref"
-        ],
         "name": "Survey Point"
     },
     "man_made/tower": {
+        "fields": [
+            "towertype"
+        ],
         "geometry": [
             "point",
             "area"
@@ -5403,30 +5468,33 @@
         "tags": {
             "man_made": "tower"
         },
-        "fields": [
-            "towertype"
-        ],
         "name": "Tower"
     },
     "man_made/wastewater_plant": {
         "icon": "water",
+        "fields": [
+            "operator",
+            "address"
+        ],
         "geometry": [
             "point",
             "area"
         ],
+        "terms": [
+            "sewage*",
+            "water treatment plant",
+            "reclamation plant"
+        ],
         "tags": {
             "man_made": "wastewater_plant"
         },
-        "name": "Wastewater Plant",
-        "terms": [
-            "sewage works",
-            "sewage treatment plant",
-            "water treatment plant",
-            "reclamation plant"
-        ]
+        "name": "Wastewater Plant"
     },
     "man_made/water_tower": {
         "icon": "water",
+        "fields": [
+            "operator"
+        ],
         "geometry": [
             "point",
             "area"
@@ -5437,6 +5505,9 @@
         "name": "Water Tower"
     },
     "man_made/water_well": {
+        "fields": [
+            "operator"
+        ],
         "geometry": [
             "point",
             "area"
@@ -5444,10 +5515,14 @@
         "tags": {
             "man_made": "water_well"
         },
-        "name": "Water well"
+        "name": "Water Well"
     },
     "man_made/water_works": {
         "icon": "water",
+        "fields": [
+            "operator",
+            "address"
+        ],
         "geometry": [
             "point",
             "area"
@@ -5458,17 +5533,17 @@
         "name": "Water Works"
     },
     "military/airfield": {
+        "icon": "airfield",
         "geometry": [
             "point",
             "vertex",
             "area"
         ],
+        "terms": [],
         "tags": {
             "military": "airfield"
         },
-        "terms": [],
-        "name": "Airfield",
-        "icon": "airfield"
+        "name": "Airfield"
     },
     "military/barracks": {
         "geometry": [
@@ -5476,10 +5551,10 @@
             "vertex",
             "area"
         ],
+        "terms": [],
         "tags": {
             "military": "barracks"
         },
-        "terms": [],
         "name": "Barracks"
     },
     "military/bunker": {
@@ -5488,10 +5563,10 @@
             "vertex",
             "area"
         ],
+        "terms": [],
         "tags": {
             "military": "bunker"
         },
-        "terms": [],
         "name": "Bunker"
     },
     "military/range": {
@@ -5500,10 +5575,10 @@
             "vertex",
             "area"
         ],
+        "terms": [],
         "tags": {
             "military": "range"
         },
-        "terms": [],
         "name": "Military Range"
     },
     "natural": {
@@ -5782,6 +5857,7 @@
         "fields": [
             "office",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -5800,6 +5876,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -5817,6 +5894,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -5834,6 +5912,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -5851,6 +5930,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -5869,6 +5949,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -5886,6 +5967,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -5896,13 +5978,16 @@
         "tags": {
             "office": "employment_agency"
         },
-        "terms": [],
+        "terms": [
+            "job"
+        ],
         "name": "Employment Agency"
     },
     "office/estate_agent": {
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -5920,6 +6005,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -5937,6 +6023,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -5954,6 +6041,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -5971,6 +6059,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -5988,6 +6077,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -6005,6 +6095,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -6022,6 +6113,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -6040,6 +6132,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -6057,6 +6150,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -6074,6 +6168,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -6091,6 +6186,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -6108,6 +6204,7 @@
         "icon": "commercial",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -6125,6 +6222,7 @@
         "icon": "suitcase",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -6340,7 +6438,12 @@
         "name": "Power"
     },
     "power/generator": {
-        "name": "Power Generator",
+        "fields": [
+            "operator",
+            "generator/source",
+            "generator/method",
+            "generator/type"
+        ],
         "geometry": [
             "point",
             "vertex",
@@ -6349,11 +6452,7 @@
         "tags": {
             "power": "generator"
         },
-        "fields": [
-            "generator/source",
-            "generator/method",
-            "generator/type"
-        ]
+        "name": "Power Generator"
     },
     "power/line": {
         "geometry": [
@@ -6616,6 +6715,8 @@
     "railway/station": {
         "icon": "rail",
         "fields": [
+            "operator",
+            "address",
             "building_area"
         ],
         "geometry": [
@@ -6703,6 +6804,7 @@
         "fields": [
             "shop",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -6728,12 +6830,12 @@
             "vertex",
             "area"
         ],
-        "tags": {
-            "shop": "alcohol"
-        },
         "terms": [
             "alcohol"
         ],
+        "tags": {
+            "shop": "alcohol"
+        },
         "name": "Liquor Store"
     },
     "shop/art": {
@@ -6749,8 +6851,7 @@
             "area"
         ],
         "terms": [
-            "art store",
-            "art gallery"
+            "art*"
         ],
         "tags": {
             "shop": "art"
@@ -7188,15 +7289,15 @@
             "vertex",
             "area"
         ],
-        "tags": {
-            "shop": "funeral_directors"
-        },
         "terms": [
             "undertaker",
             "funeral parlour",
             "funeral parlor",
             "memorial home"
         ],
+        "tags": {
+            "shop": "funeral_directors"
+        },
         "name": "Funeral Home"
     },
     "shop/furniture": {
@@ -7385,7 +7486,8 @@
             "area"
         ],
         "terms": [
-            "keys"
+            "key*",
+            "lock*"
         ],
         "tags": {
             "shop": "locksmith"
@@ -7638,7 +7740,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "geometry": [
             "point",
@@ -7675,25 +7778,25 @@
         "name": "Supermarket"
     },
     "shop/tailor": {
-        "name": "Tailor",
+        "icon": "clothing-store",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
         "geometry": [
             "point",
+            "vertex",
             "area"
         ],
-        "terms": [
-            "tailor",
-            "clothes"
-        ],
         "tags": {
             "shop": "tailor"
         },
-        "icon": "clothing-store",
-        "fields": [
-            "building_area",
-            "address",
-            "operator",
-            "opening_hours"
-        ]
+        "terms": [
+            "tailor",
+            "clothes"
+        ],
+        "name": "Tailor"
     },
     "shop/toys": {
         "icon": "shop",
@@ -7835,7 +7938,8 @@
         "icon": "lodging",
         "fields": [
             "operator",
-            "address"
+            "address",
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -7848,11 +7952,11 @@
         "name": "Alpine Hut"
     },
     "tourism/artwork": {
+        "icon": "art-gallery",
         "fields": [
             "artwork_type",
             "artist"
         ],
-        "icon": "art-gallery",
         "geometry": [
             "point",
             "vertex",
@@ -7924,8 +8028,8 @@
         "icon": "lodging",
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "smoking"
         ],
         "geometry": [
@@ -7943,6 +8047,7 @@
         "fields": [
             "operator",
             "address",
+            "building_area",
             "smoking"
         ],
         "geometry": [
@@ -7964,8 +8069,8 @@
         "icon": "lodging",
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "smoking"
         ],
         "geometry": [
@@ -7982,8 +8087,8 @@
         "icon": "lodging",
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "smoking"
         ],
         "geometry": [
@@ -8000,9 +8105,9 @@
     "tourism/information": {
         "fields": [
             "information",
-            "building_area",
+            "operator",
             "address",
-            "operator"
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -8018,8 +8123,8 @@
         "icon": "lodging",
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "smoking"
         ],
         "geometry": [
@@ -8036,8 +8141,8 @@
         "icon": "museum",
         "fields": [
             "operator",
-            "building_area",
-            "address"
+            "address",
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -8654,7 +8759,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8673,7 +8779,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8692,7 +8799,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8711,7 +8819,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8730,7 +8839,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8749,7 +8859,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8768,7 +8879,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8787,7 +8899,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8806,7 +8919,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8825,7 +8939,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8844,7 +8959,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8863,7 +8979,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8882,7 +8999,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8901,7 +9019,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8920,7 +9039,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8939,7 +9059,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8958,7 +9079,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8977,7 +9099,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -8996,7 +9119,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9015,7 +9139,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9034,7 +9159,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9053,7 +9179,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9072,7 +9199,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9091,7 +9219,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9110,7 +9239,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9129,7 +9259,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9148,7 +9279,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9167,7 +9299,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9186,7 +9319,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9205,7 +9339,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9224,7 +9359,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9243,7 +9379,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9262,7 +9399,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9281,7 +9419,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9300,7 +9439,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9319,7 +9459,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9338,7 +9479,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9357,7 +9499,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9376,7 +9519,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9395,7 +9539,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9414,7 +9559,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9433,7 +9579,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9452,7 +9599,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9471,7 +9619,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9490,7 +9639,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9509,7 +9659,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9528,7 +9679,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9547,7 +9699,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9566,7 +9719,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9585,7 +9739,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9604,7 +9759,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9623,7 +9779,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9642,7 +9799,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9661,7 +9819,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9680,7 +9839,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9699,7 +9859,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9718,7 +9879,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9737,7 +9899,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9756,7 +9919,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9775,7 +9939,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9794,7 +9959,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9813,7 +9979,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9832,7 +9999,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9851,7 +10019,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9870,7 +10039,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9889,7 +10059,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9908,7 +10079,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9927,7 +10099,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9946,7 +10119,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9965,7 +10139,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -9984,7 +10159,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10003,7 +10179,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10022,7 +10199,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10041,7 +10219,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10060,7 +10239,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10079,7 +10259,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10098,7 +10279,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10117,7 +10299,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10136,7 +10319,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10155,7 +10339,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10174,7 +10359,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10193,7 +10379,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10212,7 +10399,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10231,7 +10419,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10250,7 +10439,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10269,7 +10459,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10288,7 +10479,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10307,7 +10499,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10326,7 +10519,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10345,7 +10539,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10364,7 +10559,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10383,7 +10579,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10402,7 +10599,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10421,7 +10619,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10440,7 +10639,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10459,7 +10659,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10478,7 +10679,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10497,7 +10699,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10516,7 +10719,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10535,7 +10739,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10554,7 +10759,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10573,7 +10779,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10592,7 +10799,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10611,7 +10819,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10630,7 +10839,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10649,7 +10859,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10668,7 +10879,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10687,7 +10899,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10706,7 +10919,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10725,7 +10939,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10744,7 +10959,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10763,7 +10979,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10782,7 +10999,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10801,7 +11019,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10820,7 +11039,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10839,7 +11059,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10858,7 +11079,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10877,7 +11099,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10896,7 +11119,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10915,7 +11139,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10934,7 +11159,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10953,7 +11179,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10972,7 +11199,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -10991,7 +11219,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11010,7 +11239,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11029,7 +11259,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11048,7 +11279,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11067,7 +11299,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11086,7 +11319,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11105,7 +11339,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11124,7 +11359,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11143,7 +11379,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11162,7 +11399,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11181,7 +11419,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11200,7 +11439,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11219,7 +11459,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11238,7 +11479,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11257,7 +11499,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11276,7 +11519,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11295,7 +11539,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11315,7 +11560,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11334,7 +11580,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11353,7 +11600,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11372,7 +11620,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11391,7 +11640,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11410,7 +11660,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11429,7 +11680,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11448,7 +11700,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11467,7 +11720,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11486,7 +11740,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11505,7 +11760,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11524,7 +11780,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11543,7 +11800,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11562,7 +11820,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11581,7 +11840,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11600,7 +11860,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11619,7 +11880,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11638,7 +11900,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11657,7 +11920,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11676,7 +11940,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11695,7 +11960,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11714,7 +11980,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11733,7 +12000,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11752,7 +12020,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11771,7 +12040,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11790,7 +12060,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11809,7 +12080,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11828,7 +12100,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11847,7 +12120,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11866,7 +12140,8 @@
         "fields": [
             "operator",
             "address",
-            "building_area"
+            "building_area",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -11883,8 +12158,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -11903,8 +12178,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -11923,8 +12198,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -11943,8 +12218,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -11963,8 +12238,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -11983,8 +12258,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12003,8 +12278,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12023,8 +12298,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12043,8 +12318,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12063,8 +12338,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12083,8 +12358,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12103,8 +12378,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12123,8 +12398,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12143,8 +12418,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12163,8 +12438,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12183,8 +12458,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12203,8 +12478,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12223,8 +12498,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12243,8 +12518,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12263,8 +12538,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12283,8 +12558,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12303,8 +12578,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12323,8 +12598,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12343,8 +12618,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12363,8 +12638,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12383,8 +12658,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12403,8 +12678,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12423,8 +12698,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12443,8 +12718,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12463,8 +12738,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12483,8 +12758,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12503,8 +12778,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12523,8 +12798,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12543,8 +12818,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12563,8 +12838,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12583,8 +12858,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12603,8 +12878,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12623,8 +12898,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12643,8 +12918,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12663,8 +12938,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12683,8 +12958,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12703,8 +12978,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12723,8 +12998,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12743,8 +13018,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12763,8 +13038,8 @@
             "area"
         ],
         "fields": [
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12784,8 +13059,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12806,8 +13082,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12828,8 +13105,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12850,8 +13128,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12871,8 +13150,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12893,8 +13173,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12914,8 +13195,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12936,8 +13218,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12958,8 +13241,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -12979,8 +13263,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13000,8 +13285,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13021,8 +13307,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13042,8 +13329,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13064,8 +13352,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13085,8 +13374,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13106,8 +13396,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13128,8 +13419,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13149,8 +13441,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13170,8 +13463,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13191,8 +13485,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13212,8 +13507,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13233,8 +13529,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13254,8 +13551,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13275,8 +13573,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13296,8 +13595,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13317,8 +13617,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13339,8 +13640,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13360,8 +13662,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13381,8 +13684,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13402,8 +13706,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13423,8 +13728,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13444,8 +13750,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13466,8 +13773,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13488,8 +13796,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13509,8 +13818,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13531,8 +13841,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13552,8 +13863,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13573,8 +13885,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13595,8 +13908,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13616,8 +13930,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13637,8 +13952,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13658,8 +13974,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13680,8 +13997,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13701,8 +14019,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13722,8 +14041,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13744,8 +14064,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13767,8 +14088,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13788,8 +14110,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13809,8 +14132,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13830,8 +14154,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13851,8 +14176,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13872,8 +14198,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13895,8 +14222,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13916,8 +14244,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13937,8 +14266,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13959,8 +14289,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -13980,8 +14311,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14001,8 +14333,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14022,8 +14355,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14043,8 +14377,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14064,8 +14399,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14086,8 +14422,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14107,8 +14444,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14128,8 +14466,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14149,8 +14488,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14170,8 +14510,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14191,8 +14532,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14212,8 +14554,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14233,8 +14576,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14255,8 +14599,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14276,8 +14621,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14297,8 +14643,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14318,8 +14665,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14340,8 +14688,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14362,8 +14711,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14383,8 +14733,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14404,8 +14755,9 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -14425,8 +14777,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14447,8 +14799,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14469,8 +14821,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14491,8 +14843,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14513,8 +14865,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14535,8 +14887,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14557,8 +14909,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14579,8 +14931,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14601,8 +14953,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14623,8 +14975,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14645,8 +14997,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14667,8 +15019,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14689,8 +15041,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14711,8 +15063,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14733,8 +15085,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14755,8 +15107,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14777,8 +15129,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14799,8 +15151,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14821,8 +15173,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14843,8 +15195,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14865,8 +15217,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14887,8 +15239,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14909,8 +15261,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14931,8 +15283,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14953,8 +15305,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14975,8 +15327,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -14997,8 +15349,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15019,8 +15371,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15041,8 +15393,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15063,8 +15415,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15085,8 +15437,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15107,8 +15459,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15129,8 +15481,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15151,8 +15503,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15173,8 +15525,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15195,8 +15547,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15217,8 +15569,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15239,8 +15591,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15261,8 +15613,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15283,8 +15635,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15305,8 +15657,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15327,8 +15679,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15349,8 +15701,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15371,8 +15723,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15393,8 +15745,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15415,8 +15767,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15437,8 +15789,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15459,8 +15811,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15481,8 +15833,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15503,8 +15855,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15525,8 +15877,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15547,8 +15899,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15569,8 +15921,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15591,8 +15943,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15613,8 +15965,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15635,8 +15987,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15657,8 +16009,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15679,8 +16031,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15701,8 +16053,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15723,8 +16075,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15745,8 +16097,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15767,8 +16119,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15789,8 +16141,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15811,8 +16163,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15833,8 +16185,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15855,8 +16207,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15877,8 +16229,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15899,8 +16251,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15921,8 +16273,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15943,8 +16295,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15965,8 +16317,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -15987,8 +16339,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16009,8 +16361,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16031,8 +16383,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16053,8 +16405,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16075,8 +16427,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16097,8 +16449,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16119,8 +16471,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16141,8 +16493,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16163,8 +16515,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16185,8 +16537,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16207,8 +16559,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16229,8 +16581,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16251,8 +16603,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16273,8 +16625,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16295,8 +16647,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16317,8 +16669,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16339,8 +16691,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16361,8 +16713,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16383,8 +16735,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16405,8 +16757,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16427,8 +16779,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16449,8 +16801,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16471,8 +16823,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16493,8 +16845,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16515,8 +16867,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16537,8 +16889,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16559,8 +16911,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16581,8 +16933,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16603,8 +16955,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16625,8 +16977,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16647,8 +16999,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16669,8 +17021,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16692,8 +17044,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16714,8 +17066,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16736,8 +17088,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16758,8 +17110,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16780,8 +17132,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16802,8 +17154,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16824,8 +17176,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16846,8 +17198,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16868,8 +17220,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16890,8 +17242,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16912,8 +17264,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16934,8 +17286,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16956,8 +17308,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -16978,8 +17330,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -17000,8 +17352,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -17022,8 +17374,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -17044,8 +17396,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -17066,8 +17418,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -17088,8 +17440,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -17110,8 +17462,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -17132,8 +17484,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -17154,8 +17506,8 @@
         ],
         "fields": [
             "cuisine",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "capacity",
             "smoking"
@@ -17176,8 +17528,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17196,8 +17549,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17216,8 +17570,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17236,8 +17591,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17256,8 +17612,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17276,8 +17633,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17296,8 +17654,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17316,8 +17675,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17336,8 +17696,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17356,8 +17717,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17376,8 +17738,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17396,8 +17759,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17416,8 +17780,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17436,8 +17801,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17456,8 +17822,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17476,8 +17843,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17496,8 +17864,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17516,8 +17885,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17536,8 +17906,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17556,8 +17927,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17576,8 +17948,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17596,8 +17969,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17616,8 +17990,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17636,8 +18011,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17656,8 +18032,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17676,8 +18053,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17696,8 +18074,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17716,8 +18095,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17736,8 +18116,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17756,8 +18137,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17776,8 +18158,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17796,8 +18179,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17816,8 +18200,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17836,8 +18221,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17856,8 +18242,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17876,8 +18263,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17896,8 +18284,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17916,8 +18305,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17936,8 +18326,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17956,8 +18347,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17976,8 +18368,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -17996,8 +18389,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18016,8 +18410,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18036,8 +18431,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18056,8 +18452,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18076,8 +18473,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18096,8 +18494,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18116,8 +18515,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18136,8 +18536,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18156,8 +18557,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18176,8 +18578,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18196,8 +18599,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18216,8 +18620,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18236,8 +18641,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18256,8 +18662,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18276,8 +18683,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18296,8 +18704,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18316,8 +18725,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18336,8 +18746,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18356,8 +18767,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18376,8 +18788,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18396,8 +18809,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18416,8 +18830,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18436,8 +18851,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18456,8 +18872,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18476,8 +18893,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18496,8 +18914,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18516,8 +18935,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18536,8 +18956,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18556,8 +18977,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18576,8 +18998,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18596,8 +19019,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18616,8 +19040,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18636,8 +19061,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18656,8 +19082,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18676,8 +19103,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18696,8 +19124,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18716,8 +19145,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18736,8 +19166,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18756,8 +19187,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18776,8 +19208,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18796,8 +19229,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18816,8 +19250,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18836,8 +19271,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18856,8 +19292,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18876,8 +19313,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18896,8 +19334,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18916,8 +19355,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18936,8 +19376,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18956,8 +19397,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18976,8 +19418,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -18996,8 +19439,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19016,8 +19460,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19036,8 +19481,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19056,8 +19502,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19076,8 +19523,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19096,8 +19544,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19116,8 +19565,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19136,8 +19586,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19156,8 +19607,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19176,8 +19628,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19196,8 +19649,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19216,8 +19670,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19236,8 +19691,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19256,8 +19712,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19276,8 +19733,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19296,8 +19754,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19316,8 +19775,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19336,8 +19796,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19356,8 +19817,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19376,8 +19838,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19396,8 +19859,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19416,8 +19880,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19436,8 +19901,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19456,8 +19922,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19476,8 +19943,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19496,8 +19964,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19516,8 +19985,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19536,8 +20006,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19556,8 +20027,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19576,8 +20048,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19596,8 +20069,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19616,8 +20090,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19636,8 +20111,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19656,8 +20132,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19676,8 +20153,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19696,8 +20174,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19716,8 +20195,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19736,8 +20216,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19756,8 +20237,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19776,8 +20258,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19796,8 +20279,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19816,8 +20300,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19836,8 +20321,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19856,8 +20342,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19876,8 +20363,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19896,8 +20384,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19916,8 +20405,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19936,8 +20426,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19956,8 +20447,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19976,8 +20468,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -19996,8 +20489,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20016,8 +20510,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20036,8 +20531,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20056,8 +20552,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20076,8 +20573,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20096,8 +20594,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20116,8 +20615,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20136,8 +20636,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20156,8 +20657,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20176,8 +20678,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20196,8 +20699,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20216,8 +20720,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20236,8 +20741,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20256,8 +20762,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20276,8 +20783,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20296,8 +20804,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20316,8 +20825,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20336,8 +20846,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20356,8 +20867,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20376,8 +20888,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20396,8 +20909,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20416,8 +20930,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20436,8 +20951,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20456,8 +20972,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20476,8 +20993,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20496,8 +21014,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20516,8 +21035,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20536,8 +21056,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20556,8 +21077,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20576,8 +21098,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20596,8 +21119,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20616,8 +21140,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20636,8 +21161,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20656,8 +21182,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20676,8 +21203,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20696,8 +21224,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20716,8 +21245,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20736,8 +21266,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20756,8 +21287,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20776,8 +21308,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20796,8 +21329,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20816,8 +21350,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20836,8 +21371,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20856,8 +21392,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20876,8 +21413,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20896,8 +21434,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20916,8 +21455,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20936,8 +21476,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20956,8 +21497,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20976,8 +21518,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -20996,8 +21539,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21016,8 +21560,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21036,8 +21581,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21056,8 +21602,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21076,8 +21623,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21096,8 +21644,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21116,8 +21665,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21136,8 +21686,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21156,8 +21707,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21176,8 +21728,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21196,8 +21749,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21216,8 +21770,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21236,8 +21791,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21256,8 +21812,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21276,8 +21833,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21296,8 +21854,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21316,8 +21875,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21336,8 +21896,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21356,8 +21917,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21376,8 +21938,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21396,8 +21959,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21417,8 +21981,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21438,8 +22003,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21459,8 +22025,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21480,8 +22047,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21501,8 +22069,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21521,8 +22090,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21541,8 +22111,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21561,8 +22132,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21581,8 +22153,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21601,8 +22174,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21621,8 +22195,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21641,8 +22216,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21662,8 +22238,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21682,8 +22259,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21702,8 +22280,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21722,8 +22301,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21742,8 +22322,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21762,8 +22343,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21782,8 +22364,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21802,8 +22385,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21822,8 +22406,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21842,8 +22427,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21862,8 +22448,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21882,8 +22469,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21902,8 +22490,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21922,8 +22511,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21942,8 +22532,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21962,8 +22553,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -21982,8 +22574,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22002,8 +22595,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22022,8 +22616,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22042,8 +22637,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22063,8 +22659,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22083,8 +22680,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22103,8 +22701,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22123,8 +22722,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22143,8 +22743,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22163,8 +22764,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22183,8 +22785,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22203,8 +22806,9 @@
         ],
         "fields": [
             "atm",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22335,8 +22939,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22355,8 +22959,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22375,8 +22979,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22395,8 +22999,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22415,8 +23019,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22435,8 +23039,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22455,8 +23059,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22475,8 +23079,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22495,8 +23099,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22515,8 +23119,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22535,8 +23139,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22555,8 +23159,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22575,8 +23179,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22595,8 +23199,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22615,8 +23219,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22635,8 +23239,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22655,8 +23259,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22675,8 +23279,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22695,8 +23299,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22715,8 +23319,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22735,8 +23339,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22755,8 +23359,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22775,8 +23379,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22795,8 +23399,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22815,8 +23419,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22835,8 +23439,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22855,8 +23459,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22875,8 +23479,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22895,8 +23499,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22915,8 +23519,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22935,8 +23539,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22955,8 +23559,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22975,8 +23579,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -22995,8 +23599,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23015,8 +23619,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23035,8 +23639,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23055,8 +23659,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23075,8 +23679,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23095,8 +23699,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23115,8 +23719,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23135,8 +23739,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23155,8 +23759,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23175,8 +23779,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23195,8 +23799,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23215,8 +23819,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23235,8 +23839,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23255,8 +23859,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23275,8 +23879,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23295,8 +23899,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23315,8 +23919,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23335,8 +23939,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23355,8 +23959,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23375,8 +23979,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23395,8 +23999,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23415,8 +24019,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23435,8 +24039,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23455,8 +24059,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23475,8 +24079,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23495,8 +24099,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23515,8 +24119,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23535,8 +24139,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23555,8 +24159,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23575,8 +24179,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23595,8 +24199,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23615,8 +24219,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23635,8 +24239,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23655,8 +24259,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23675,8 +24279,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23695,8 +24299,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23715,8 +24319,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23735,8 +24339,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23755,8 +24359,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23775,8 +24379,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23795,8 +24399,8 @@
         ],
         "fields": [
             "operator",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "suggestion": true
@@ -23817,8 +24421,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -23839,8 +24443,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -23861,8 +24465,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -23883,8 +24487,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -23905,8 +24509,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -23927,8 +24531,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -23949,8 +24553,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -23971,8 +24575,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -23994,8 +24598,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24016,8 +24620,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24038,8 +24642,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24060,8 +24664,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24082,8 +24686,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24104,8 +24708,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24127,8 +24731,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24149,8 +24753,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24171,8 +24775,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24193,8 +24797,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24216,8 +24820,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24238,8 +24842,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24260,8 +24864,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24282,8 +24886,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24304,8 +24908,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24326,8 +24930,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24348,8 +24952,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24370,8 +24974,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24393,8 +24997,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24415,8 +25019,8 @@
         "fields": [
             "cuisine",
             "internet_access",
-            "building_area",
             "address",
+            "building_area",
             "opening_hours",
             "smoking"
         ],
@@ -24437,7 +25041,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24456,7 +25061,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24475,7 +25081,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24494,7 +25101,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24513,7 +25121,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24532,7 +25141,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24551,7 +25161,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24570,7 +25181,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24589,7 +25201,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24608,7 +25221,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24627,7 +25241,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24646,7 +25261,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24665,7 +25281,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24684,7 +25301,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24703,7 +25321,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24722,7 +25341,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24741,7 +25361,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24760,7 +25381,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24779,7 +25401,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24798,7 +25421,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24817,7 +25441,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24836,7 +25461,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24855,7 +25481,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24874,7 +25501,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24893,7 +25521,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24912,7 +25541,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24931,7 +25561,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24950,7 +25581,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24969,7 +25601,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -24988,7 +25621,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25007,7 +25641,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25026,7 +25661,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25045,7 +25681,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25064,7 +25701,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25083,7 +25721,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25102,7 +25741,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25121,7 +25761,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25140,7 +25781,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25159,7 +25801,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25178,7 +25821,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25197,7 +25841,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25216,7 +25861,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25235,7 +25881,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25254,7 +25901,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25273,7 +25921,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25292,7 +25941,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25311,7 +25961,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25330,7 +25981,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25349,7 +26001,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25368,7 +26021,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25387,7 +26041,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25406,7 +26061,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25425,7 +26081,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25444,7 +26101,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25463,7 +26121,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25482,7 +26141,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25501,7 +26161,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25520,7 +26181,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25539,7 +26201,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25558,7 +26221,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25577,7 +26241,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25596,7 +26261,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25615,7 +26281,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25634,7 +26301,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25653,7 +26321,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25672,7 +26341,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25691,7 +26361,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25710,7 +26381,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25729,7 +26401,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25748,7 +26421,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25767,7 +26441,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25786,7 +26461,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25805,7 +26481,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25824,7 +26501,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25843,7 +26521,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25862,7 +26541,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25881,7 +26561,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25900,7 +26581,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25919,7 +26601,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25938,7 +26621,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25957,7 +26641,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25976,7 +26661,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -25995,7 +26681,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26014,7 +26701,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26033,7 +26721,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26052,7 +26741,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26071,7 +26761,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26090,7 +26781,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26109,7 +26801,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26128,7 +26821,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26147,7 +26841,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26166,7 +26861,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26185,7 +26881,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26204,7 +26901,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26223,7 +26921,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26242,7 +26941,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26261,7 +26961,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26280,7 +26981,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26299,7 +27001,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26318,7 +27021,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26337,7 +27041,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26356,7 +27061,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26375,7 +27081,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26394,7 +27101,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26413,7 +27121,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26432,7 +27141,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26451,7 +27161,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26470,7 +27181,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26489,7 +27201,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26508,7 +27221,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26527,7 +27241,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26546,7 +27261,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26565,7 +27281,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26584,7 +27301,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26603,7 +27321,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26622,7 +27341,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26641,7 +27361,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26660,7 +27381,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26679,7 +27401,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26698,7 +27421,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26717,7 +27441,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26736,7 +27461,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26755,7 +27481,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26774,7 +27501,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26793,7 +27521,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26812,7 +27541,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26831,7 +27561,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26850,7 +27581,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26869,7 +27601,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26888,7 +27621,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26907,7 +27641,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26926,7 +27661,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26945,7 +27681,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26964,7 +27701,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -26983,7 +27721,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27002,7 +27741,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27021,7 +27761,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27040,7 +27781,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27059,7 +27801,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27078,7 +27821,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27097,7 +27841,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27116,7 +27861,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27135,7 +27881,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27154,7 +27901,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27173,7 +27921,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27192,7 +27941,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27211,7 +27961,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27230,7 +27981,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27249,7 +28001,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27268,7 +28021,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27287,7 +28041,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27306,7 +28061,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27325,7 +28081,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27344,7 +28101,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27363,7 +28121,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27382,7 +28141,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27401,7 +28161,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27420,7 +28181,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27439,7 +28201,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27458,7 +28221,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27477,7 +28241,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27496,7 +28261,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27515,7 +28281,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27534,7 +28301,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27553,7 +28321,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27572,7 +28341,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27591,7 +28361,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27610,7 +28381,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27629,7 +28401,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27648,7 +28421,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27667,7 +28441,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27686,7 +28461,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27705,7 +28481,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27724,7 +28501,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27743,7 +28521,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27762,7 +28541,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27781,7 +28561,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27800,7 +28581,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27819,7 +28601,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27838,7 +28621,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27857,7 +28641,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27876,7 +28661,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27895,7 +28681,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27914,7 +28701,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27933,7 +28721,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27952,7 +28741,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27971,7 +28761,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -27990,7 +28781,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28009,7 +28801,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28028,7 +28821,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28047,7 +28841,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28066,7 +28861,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28085,7 +28881,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28104,7 +28901,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28123,7 +28921,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28142,7 +28941,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28161,7 +28961,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28180,7 +28981,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28199,7 +29001,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28218,7 +29021,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28237,7 +29041,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28256,7 +29061,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28275,7 +29081,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28294,7 +29101,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28313,7 +29121,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28332,7 +29141,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28351,7 +29161,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28370,7 +29181,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28389,7 +29201,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28408,7 +29221,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28427,7 +29241,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28446,7 +29261,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28465,7 +29281,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28484,7 +29301,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28503,7 +29321,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28522,7 +29341,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28541,7 +29361,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28560,7 +29381,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28579,7 +29401,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28598,7 +29421,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28617,7 +29441,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28636,7 +29461,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28655,7 +29481,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28674,7 +29501,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28693,7 +29521,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28712,7 +29541,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28731,7 +29561,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28750,7 +29581,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28769,7 +29601,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28788,7 +29621,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28807,7 +29641,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
@@ -28826,7 +29661,8 @@
         "fields": [
             "operator",
             "building_area",
-            "address"
+            "address",
+            "opening_hours"
         ],
         "suggestion": true
     },
diff --git a/data/presets/presets/amenity/arts_centre.json b/data/presets/presets/amenity/arts_centre.json
index d2726680d..3718d908e 100644
--- a/data/presets/presets/amenity/arts_centre.json
+++ b/data/presets/presets/amenity/arts_centre.json
@@ -1,19 +1,19 @@
 {
-    "name": "Arts Center",
+    "icon": "theatre",
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "arts",
-        "arts centre"
+        "art*"
     ],
     "tags": {
         "amenity": "arts_centre"
     },
-    "icon": "theatre",
-    "fields": [
-        "building_area",
-        "address"
-    ]
+    "name": "Arts Center"
 }
diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json
index 775858856..abedbf950 100644
--- a/data/presets/presets/amenity/bank.json
+++ b/data/presets/presets/amenity/bank.json
@@ -2,8 +2,9 @@
     "icon": "bank",
     "fields": [
         "atm",
-        "building_area",
+        "operator",
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -38,4 +39,4 @@
         "amenity": "bank"
     },
     "name": "Bank"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
index b231b4d62..0b8f0fec0 100644
--- a/data/presets/presets/amenity/bar.json
+++ b/data/presets/presets/amenity/bar.json
@@ -1,8 +1,8 @@
 {
     "icon": "bar",
     "fields": [
-        "building_area",
         "address",
+        "building_area",
         "opening_hours",
         "smoking"
     ],
diff --git a/data/presets/presets/amenity/bench.json b/data/presets/presets/amenity/bench.json
index cc012c748..32c74dfc3 100644
--- a/data/presets/presets/amenity/bench.json
+++ b/data/presets/presets/amenity/bench.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "backrest"
+    ],
     "geometry": [
         "point",
         "vertex",
@@ -7,8 +10,5 @@
     "tags": {
         "amenity": "bench"
     },
-    "fields": [
-        "backrest"
-    ],
     "name": "Bench"
 }
diff --git a/data/presets/presets/amenity/boat_rental.json b/data/presets/presets/amenity/boat_rental.json
index a0217dd05..3787ea97e 100644
--- a/data/presets/presets/amenity/boat_rental.json
+++ b/data/presets/presets/amenity/boat_rental.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "operator"
+    ],
     "geometry": [
         "point",
         "area"
@@ -6,8 +9,5 @@
     "tags": {
         "amenity": "boat_rental"
     },
-    "fields": [
-        "operator"
-    ],
     "name": "Boat Rental"
 }
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
index 91ca99e64..5ffa46157 100644
--- a/data/presets/presets/amenity/cafe.json
+++ b/data/presets/presets/amenity/cafe.json
@@ -3,8 +3,8 @@
     "fields": [
         "cuisine",
         "internet_access",
-        "building_area",
         "address",
+        "building_area",
         "opening_hours",
         "smoking"
     ],
diff --git a/data/presets/presets/amenity/car_rental.json b/data/presets/presets/amenity/car_rental.json
index 53b76efd6..0da3d3ea0 100644
--- a/data/presets/presets/amenity/car_rental.json
+++ b/data/presets/presets/amenity/car_rental.json
@@ -1,5 +1,8 @@
 {
     "icon": "car",
+    "fields": [
+        "operator"
+    ],
     "geometry": [
         "point",
         "area"
@@ -7,8 +10,5 @@
     "tags": {
         "amenity": "car_rental"
     },
-    "fields": [
-        "operator"
-    ],
     "name": "Car Rental"
 }
diff --git a/data/presets/presets/amenity/car_sharing.json b/data/presets/presets/amenity/car_sharing.json
index 9fed370dc..6316ef9f2 100644
--- a/data/presets/presets/amenity/car_sharing.json
+++ b/data/presets/presets/amenity/car_sharing.json
@@ -1,5 +1,9 @@
 {
     "icon": "car",
+    "fields": [
+        "operator",
+        "capacity"
+    ],
     "geometry": [
         "point",
         "area"
@@ -7,9 +11,5 @@
     "tags": {
         "amenity": "car_sharing"
     },
-    "fields": [
-        "operator",
-        "capacity"
-    ],
     "name": "Car Sharing"
 }
diff --git a/data/presets/presets/amenity/car_wash.json b/data/presets/presets/amenity/car_wash.json
index 5c12b1d03..e12930227 100644
--- a/data/presets/presets/amenity/car_wash.json
+++ b/data/presets/presets/amenity/car_wash.json
@@ -1,5 +1,10 @@
 {
     "icon": "car",
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -7,8 +12,5 @@
     "tags": {
         "amenity": "car_wash"
     },
-    "fields": [
-        "building_area"
-    ],
     "name": "Car Wash"
 }
diff --git a/data/presets/presets/amenity/charging_station.json b/data/presets/presets/amenity/charging_station.json
index 1306b5df9..fae58880c 100644
--- a/data/presets/presets/amenity/charging_station.json
+++ b/data/presets/presets/amenity/charging_station.json
@@ -1,5 +1,8 @@
 {
     "icon": "car",
+    "fields": [
+        "operator"
+    ],
     "geometry": [
         "point",
         "area"
@@ -7,9 +10,6 @@
     "tags": {
         "amenity": "charging_station"
     },
-    "fields": [
-        "operator"
-    ],
     "terms": [
         "EV",
         "Electric Vehicle",
diff --git a/data/presets/presets/amenity/childcare.json b/data/presets/presets/amenity/childcare.json
index dd6c21034..a2c647f9b 100644
--- a/data/presets/presets/amenity/childcare.json
+++ b/data/presets/presets/amenity/childcare.json
@@ -1,8 +1,10 @@
 {
     "icon": "school",
     "fields": [
+        "operator",
+        "address",
         "building_area",
-        "address"
+        "opening_hours"
     ],
     "geometry": [
         "point",
@@ -10,6 +12,7 @@
         "area"
     ],
     "terms": [
+        "daycare",
         "nursery",
         "orphanage",
         "playgroup"
@@ -17,5 +20,5 @@
     "tags": {
         "amenity": "childcare"
     },
-    "name": "Childcare"
+    "name": "Nursery/Childcare"
 }
diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json
index e3fc68351..20f5a11ca 100644
--- a/data/presets/presets/amenity/cinema.json
+++ b/data/presets/presets/amenity/cinema.json
@@ -1,8 +1,9 @@
 {
     "icon": "cinema",
     "fields": [
+        "address",
         "building_area",
-        "address"
+        "opening_hours"
     ],
     "geometry": [
         "point",
@@ -32,4 +33,4 @@
         "amenity": "cinema"
     },
     "name": "Cinema"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/clinic.json b/data/presets/presets/amenity/clinic.json
index 3c536633d..b0fb2be4d 100644
--- a/data/presets/presets/amenity/clinic.json
+++ b/data/presets/presets/amenity/clinic.json
@@ -1,5 +1,10 @@
 {
-    "name": "Clinic",
+    "icon": "hospital",
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -11,10 +16,5 @@
     "tags": {
         "amenity": "clinic"
     },
-    "icon": "hospital",
-    "fields": [
-        "building_area",
-        "address",
-        "opening_hours"
-    ]
+    "name": "Clinic"
 }
diff --git a/data/presets/presets/amenity/college.json b/data/presets/presets/amenity/college.json
index b834be16d..4d0f5f18c 100644
--- a/data/presets/presets/amenity/college.json
+++ b/data/presets/presets/amenity/college.json
@@ -8,9 +8,12 @@
         "point",
         "area"
     ],
+    "terms": [
+        "college",
+        "university"
+    ],
     "tags": {
         "amenity": "college"
     },
-    "terms": [],
-    "name": "College"
+    "name": "College Grounds"
 }
diff --git a/data/presets/presets/amenity/courthouse.json b/data/presets/presets/amenity/courthouse.json
index cc6e1165f..eee6ec11b 100644
--- a/data/presets/presets/amenity/courthouse.json
+++ b/data/presets/presets/amenity/courthouse.json
@@ -1,8 +1,9 @@
 {
+    "icon": "town-hall",
     "fields": [
         "operator",
-        "building_area",
-        "address"
+        "address",
+        "building_area"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/dentist.json b/data/presets/presets/amenity/dentist.json
index e9edb7fef..e0482c089 100644
--- a/data/presets/presets/amenity/dentist.json
+++ b/data/presets/presets/amenity/dentist.json
@@ -1,20 +1,21 @@
 {
-    "name": "Dentist",
+    "icon": "hospital",
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "dentist",
-        "dentist's office"
+        "dentist*",
+        "tooth",
+        "teeth"
     ],
     "tags": {
         "amenity": "dentist"
     },
-    "icon": "hospital",
-    "fields": [
-        "building_area",
-        "address",
-        "opening_hours"
-    ]
+    "name": "Dentist"
 }
diff --git a/data/presets/presets/amenity/doctor.json b/data/presets/presets/amenity/doctor.json
index c3670b029..cf874a11b 100644
--- a/data/presets/presets/amenity/doctor.json
+++ b/data/presets/presets/amenity/doctor.json
@@ -1,20 +1,20 @@
 {
-    "name": "Doctor",
+    "icon": "hospital",
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "doctor",
-        "doctor's office"
+        "doctor*",
+        "medic*"
     ],
     "tags": {
         "amenity": "doctors"
     },
-    "icon": "hospital",
-    "fields": [
-        "building_area",
-        "address",
-        "opening_hours"
-    ]
+    "name": "Doctor"
 }
diff --git a/data/presets/presets/amenity/dojo.json b/data/presets/presets/amenity/dojo.json
index 9540b26d1..38fa51f4f 100644
--- a/data/presets/presets/amenity/dojo.json
+++ b/data/presets/presets/amenity/dojo.json
@@ -1,5 +1,11 @@
 {
     "icon": "pitch",
+    "fields": [
+        "sport",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry" : [
         "point", "area"
     ],
@@ -11,9 +17,5 @@
     "tags": {
         "amenity": "dojo"
     },
-    "fields": [
-        "address",
-        "sport"
-    ],
     "name": "Dojo / Martial Arts Academy"
 }
diff --git a/data/presets/presets/amenity/embassy.json b/data/presets/presets/amenity/embassy.json
index 577ffd129..8cfe63468 100644
--- a/data/presets/presets/amenity/embassy.json
+++ b/data/presets/presets/amenity/embassy.json
@@ -1,4 +1,10 @@
 {
+    "icon": "embassy",
+    "fields": [
+        "country",
+        "address",
+        "building_area"
+    ],
     "geometry": [
         "area",
         "point"
@@ -6,10 +12,5 @@
     "tags": {
         "amenity": "embassy"
     },
-    "fields": [
-        "country",
-        "building_area"
-    ],
-    "icon": "embassy",
     "name": "Embassy"
 }
diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json
index d7b4ac284..aa13b4107 100644
--- a/data/presets/presets/amenity/fast_food.json
+++ b/data/presets/presets/amenity/fast_food.json
@@ -2,8 +2,9 @@
     "icon": "fast-food",
     "fields": [
         "cuisine",
-        "building_area",
+        "operator",
         "address",
+        "building_area",
         "opening_hours",
         "smoking"
     ],
diff --git a/data/presets/presets/amenity/fire_station.json b/data/presets/presets/amenity/fire_station.json
index 8d4853c8e..58d2b00c5 100644
--- a/data/presets/presets/amenity/fire_station.json
+++ b/data/presets/presets/amenity/fire_station.json
@@ -2,8 +2,8 @@
     "icon": "fire-station",
     "fields": [
         "operator",
-        "building_area",
-        "address"
+        "address",
+        "building_area"
     ],
     "geometry": [
         "point",
@@ -15,4 +15,4 @@
     },
     "terms": [],
     "name": "Fire Station"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/fuel.json b/data/presets/presets/amenity/fuel.json
index 011b5d361..b0a65c0c7 100644
--- a/data/presets/presets/amenity/fuel.json
+++ b/data/presets/presets/amenity/fuel.json
@@ -3,7 +3,8 @@
     "fields": [
         "operator",
         "address",
-        "building_area"
+        "building_area",
+        "opening_hours"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json
index a2fc1792d..cd6978469 100644
--- a/data/presets/presets/amenity/kindergarten.json
+++ b/data/presets/presets/amenity/kindergarten.json
@@ -1,19 +1,20 @@
 {
     "icon": "school",
     "fields": [
+        "operator",
         "address"
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
-        "nursery",
+        "kindergarten",
+        "kindergarden",
         "preschool"
     ],
     "tags": {
         "amenity": "kindergarten"
     },
-    "name": "Kindergarten Grounds"
+    "name": "Preschool/Kindergarten Grounds"
 }
diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
index bd42427db..ace9b4855 100644
--- a/data/presets/presets/amenity/library.json
+++ b/data/presets/presets/amenity/library.json
@@ -3,7 +3,8 @@
     "fields": [
         "operator",
         "building_area",
-        "address"
+        "address",
+        "opening_hours"
     ],
     "geometry": [
         "point",
@@ -15,4 +16,4 @@
     },
     "terms": [],
     "name": "Library"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/marketplace.json b/data/presets/presets/amenity/marketplace.json
index 5fb0a9969..301dbdd65 100644
--- a/data/presets/presets/amenity/marketplace.json
+++ b/data/presets/presets/amenity/marketplace.json
@@ -1,4 +1,9 @@
 {
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "vertex",
@@ -7,8 +12,5 @@
     "tags": {
         "amenity": "marketplace"
     },
-    "fields": [
-        "building_area"
-    ],
     "name": "Marketplace"
 }
diff --git a/data/presets/presets/amenity/nightclub.json b/data/presets/presets/amenity/nightclub.json
index 48f0f038e..47f2efae9 100644
--- a/data/presets/presets/amenity/nightclub.json
+++ b/data/presets/presets/amenity/nightclub.json
@@ -1,8 +1,8 @@
 {
     "icon": "bar",
     "fields": [
-        "building_area",
         "address",
+        "building_area",
         "opening_hours",
         "smoking"
     ],
diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json
index 790e20aca..4cc1e4621 100644
--- a/data/presets/presets/amenity/pharmacy.json
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -2,8 +2,8 @@
     "icon": "pharmacy",
     "fields": [
         "operator",
-        "building_area",
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,6 +14,9 @@
     "tags": {
         "amenity": "pharmacy"
     },
-    "terms": [],
+    "terms": [
+        "drug",
+        "medicine"
+    ],
     "name": "Pharmacy"
 }
diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json
index 256407eae..8432eec5a 100644
--- a/data/presets/presets/amenity/place_of_worship.json
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -3,8 +3,8 @@
     "fields": [
         "religion",
         "denomination",
-        "building_area",
-        "address"
+        "address",
+        "building_area"
     ],
     "geometry": [
         "point",
@@ -40,4 +40,4 @@
         "amenity": "place_of_worship"
     },
     "name": "Place of Worship"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json
index 1b3b68f55..e8acfda62 100644
--- a/data/presets/presets/amenity/police.json
+++ b/data/presets/presets/amenity/police.json
@@ -2,8 +2,8 @@
     "icon": "police",
     "fields": [
         "operator",
-        "building_area",
-        "address"
+        "address",
+        "building_area"
     ],
     "geometry": [
         "point",
@@ -44,4 +44,4 @@
         "amenity": "police"
     },
     "name": "Police"
-}
\ 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 7b6e3b62b..14cd21851 100644
--- a/data/presets/presets/amenity/post_office.json
+++ b/data/presets/presets/amenity/post_office.json
@@ -2,8 +2,9 @@
     "icon": "post",
     "fields": [
         "operator",
-        "collection_times",
-        "building_area"
+        "address",
+        "building_area",
+        "collection_times"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
index ccb8a194f..a3fbe88a2 100644
--- a/data/presets/presets/amenity/pub.json
+++ b/data/presets/presets/amenity/pub.json
@@ -1,8 +1,8 @@
 {
     "icon": "beer",
     "fields": [
-        "building_area",
         "address",
+        "building_area",
         "opening_hours",
         "smoking"
     ],
diff --git a/data/presets/presets/amenity/ranger_station.json b/data/presets/presets/amenity/ranger_station.json
index 6092f5c4f..d9b2e6ebc 100644
--- a/data/presets/presets/amenity/ranger_station.json
+++ b/data/presets/presets/amenity/ranger_station.json
@@ -1,9 +1,9 @@
 {
     "fields": [
-        "building_area",
-        "opening_hours",
         "operator",
-        "phone"
+        "address",
+        "building_area",
+        "opening_hours"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/recycling.json b/data/presets/presets/amenity/recycling.json
index 975b641b5..06210a3bf 100644
--- a/data/presets/presets/amenity/recycling.json
+++ b/data/presets/presets/amenity/recycling.json
@@ -1,6 +1,8 @@
 {
     "icon": "recycling",
     "fields": [
+        "operator",
+        "address",
         "recycling/cans",
         "recycling/glass",
         "recycling/paper",
diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json
index e1180566b..0764e26c3 100644
--- a/data/presets/presets/amenity/restaurant.json
+++ b/data/presets/presets/amenity/restaurant.json
@@ -2,8 +2,8 @@
     "icon": "restaurant",
     "fields": [
         "cuisine",
-        "building_area",
         "address",
+        "building_area",
         "opening_hours",
         "capacity",
         "smoking"
diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
index beed32e3e..15f89da2e 100644
--- a/data/presets/presets/amenity/school.json
+++ b/data/presets/presets/amenity/school.json
@@ -6,26 +6,11 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
     "terms": [
         "academy",
-        "alma mater",
-        "blackboard",
-        "college",
-        "department",
-        "discipline",
-        "establishment",
-        "faculty",
-        "hall",
-        "halls of ivy",
-        "institute",
-        "institution",
-        "jail*",
-        "schoolhouse",
-        "seminary",
-        "university"
+        "school*"
     ],
     "tags": {
         "amenity": "school"
diff --git a/data/presets/presets/amenity/social_facility.json b/data/presets/presets/amenity/social_facility.json
index 9b1387a96..926a814b8 100644
--- a/data/presets/presets/amenity/social_facility.json
+++ b/data/presets/presets/amenity/social_facility.json
@@ -1,5 +1,12 @@
 {
-    "name": "Social Facility",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "wheelchair",
+        "social_facility_for"
+    ],
     "geometry": [
         "point",
         "area"
@@ -9,12 +16,5 @@
     "tags": {
         "amenity": "social_facility"
     },
-    "fields": [
-        "social_facility_for",
-        "address",
-        "phone",
-        "opening_hours",
-        "wheelchair",
-        "operator"
-    ]
+    "name": "Social Facility"
 }
diff --git a/data/presets/presets/amenity/social_facility/food_bank.json b/data/presets/presets/amenity/social_facility/food_bank.json
index 73694e05f..46053afac 100644
--- a/data/presets/presets/amenity/social_facility/food_bank.json
+++ b/data/presets/presets/amenity/social_facility/food_bank.json
@@ -1,5 +1,11 @@
 {
-    "name": "Food Bank",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "social_facility_for"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,12 +16,5 @@
         "amenity": "social_facility",
         "social_facility": "food_bank"
     },
-    "fields": [
-        "social_facility_for",
-        "address",
-        "phone",
-        "opening_hours",
-        "wheelchair",
-        "operator"
-    ]
+    "name": "Food Bank"
 }
diff --git a/data/presets/presets/amenity/social_facility/group_home.json b/data/presets/presets/amenity/social_facility/group_home.json
index 39090ec01..215192618 100644
--- a/data/presets/presets/amenity/social_facility/group_home.json
+++ b/data/presets/presets/amenity/social_facility/group_home.json
@@ -1,5 +1,12 @@
 {
-    "name": "Group Home",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "wheelchair",
+        "social_facility_for"
+    ],
     "geometry": [
         "point",
         "area"
@@ -14,12 +21,5 @@
         "social_facility": "group_home",
         "social_facility_for": "senior"
     },
-    "fields": [
-        "social_facility_for",
-        "address",
-        "phone",
-        "opening_hours",
-        "wheelchair",
-        "operator"
-    ]
+    "name": "Elderly Group Home"
 }
diff --git a/data/presets/presets/amenity/social_facility/homeless_shelter.json b/data/presets/presets/amenity/social_facility/homeless_shelter.json
index 624da6f70..456298778 100644
--- a/data/presets/presets/amenity/social_facility/homeless_shelter.json
+++ b/data/presets/presets/amenity/social_facility/homeless_shelter.json
@@ -1,5 +1,12 @@
 {
-    "name": "Homeless Shelter",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "wheelchair",
+        "social_facility_for"
+    ],
     "geometry": [
         "point",
         "area"
@@ -14,12 +21,5 @@
         "social_facility": "shelter",
         "social_facility:for": "homeless"
     },
-    "fields": [
-        "social_facility_for",
-        "address",
-        "phone",
-        "opening_hours",
-        "wheelchair",
-        "operator"
-    ]
+    "name": "Homeless Shelter"
 }
diff --git a/data/presets/presets/amenity/studio.json b/data/presets/presets/amenity/studio.json
index ac2ec4031..fb1a0f7d2 100644
--- a/data/presets/presets/amenity/studio.json
+++ b/data/presets/presets/amenity/studio.json
@@ -1,5 +1,10 @@
 {
-    "name": "Studio",
+    "icon": "music",
+    "fields": [
+        "studio_type",
+        "address",
+        "building_area"
+    ],
     "geometry": [
         "point",
         "area"
@@ -15,10 +20,5 @@
     "tags": {
         "amenity": "studio"
     },
-    "icon": "music",
-    "fields": [
-        "building_area",
-        "studio_type",
-        "address"
-    ]
+    "name": "Studio"
 }
diff --git a/data/presets/presets/amenity/swimming_pool.json b/data/presets/presets/amenity/swimming_pool.json
index d292ecfd3..0b8bcbaed 100644
--- a/data/presets/presets/amenity/swimming_pool.json
+++ b/data/presets/presets/amenity/swimming_pool.json
@@ -1,4 +1,5 @@
 {
+    "icon": "swimming",
     "geometry": [
         "point",
         "vertex",
@@ -7,7 +8,6 @@
     "tags": {
         "amenity": "swimming_pool"
     },
-    "icon": "swimming",
     "searchable": false,
     "name": "Swimming Pool"
 }
diff --git a/data/presets/presets/amenity/theatre.json b/data/presets/presets/amenity/theatre.json
index 90669c2b5..84026882d 100644
--- a/data/presets/presets/amenity/theatre.json
+++ b/data/presets/presets/amenity/theatre.json
@@ -2,8 +2,8 @@
     "icon": "theatre",
     "fields": [
         "operator",
-        "building_area",
-        "address"
+        "address",
+        "building_area"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json
index e9b204762..79b011150 100644
--- a/data/presets/presets/amenity/townhall.json
+++ b/data/presets/presets/amenity/townhall.json
@@ -1,8 +1,8 @@
 {
     "icon": "town-hall",
     "fields": [
-        "building_area",
-        "address"
+        "address",
+        "building_area"
     ],
     "geometry": [
         "point",
@@ -21,4 +21,4 @@
         "amenity": "townhall"
     },
     "name": "Town Hall"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json
index 160429272..e06eb9905 100644
--- a/data/presets/presets/amenity/university.json
+++ b/data/presets/presets/amenity/university.json
@@ -6,12 +6,14 @@
     ],
     "geometry": [
         "point",
-        "vertex",
         "area"
     ],
+    "terms": [
+        "college",
+        "university"
+    ],
     "tags": {
         "amenity": "university"
     },
-    "terms": ["college"],
-    "name": "University"
+    "name": "University Grounds"
 }
diff --git a/data/presets/presets/amenity/veterinary.json b/data/presets/presets/amenity/veterinary.json
index 7d1023dbb..de929800e 100644
--- a/data/presets/presets/amenity/veterinary.json
+++ b/data/presets/presets/amenity/veterinary.json
@@ -1,5 +1,10 @@
 {
-    "fields": [],
+    "icon": "dog-park",
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/building/college.json b/data/presets/presets/building/college.json
new file mode 100644
index 000000000..e3d776fc2
--- /dev/null
+++ b/data/presets/presets/building/college.json
@@ -0,0 +1,20 @@
+{
+    "icon": "building",
+    "fields": [
+        "address",
+        "levels"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "college",
+        "university"
+    ],
+    "tags": {
+        "building": "college"
+    },
+    "name": "College Building"
+}
diff --git a/data/presets/presets/building/kindergarten.json b/data/presets/presets/building/kindergarten.json
new file mode 100644
index 000000000..850e478a7
--- /dev/null
+++ b/data/presets/presets/building/kindergarten.json
@@ -0,0 +1,21 @@
+{
+    "icon": "building",
+    "fields": [
+        "address",
+        "levels"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "kindergarten",
+        "kindergarden",
+        "preschool"
+    ],
+    "tags": {
+        "building": "kindergarten"
+    },
+    "name": "Preschool/Kindergarten Building"
+}
diff --git a/data/presets/presets/building/school.json b/data/presets/presets/building/school.json
index 57e35b925..0d7078c98 100644
--- a/data/presets/presets/building/school.json
+++ b/data/presets/presets/building/school.json
@@ -9,6 +9,10 @@
         "vertex",
         "area"
     ],
+    "terms": [
+        "academy",
+        "school*"
+    ],
     "tags": {
         "building": "school"
     },
diff --git a/data/presets/presets/building/university.json b/data/presets/presets/building/university.json
index 78c591873..cbdd28659 100644
--- a/data/presets/presets/building/university.json
+++ b/data/presets/presets/building/university.json
@@ -9,6 +9,10 @@
         "vertex",
         "area"
     ],
+    "terms": [
+        "college",
+        "university"
+    ],
     "tags": {
         "building": "university"
     },
diff --git a/data/presets/presets/craft/basket_maker.json b/data/presets/presets/craft/basket_maker.json
index fb5979f61..78f90b57f 100644
--- a/data/presets/presets/craft/basket_maker.json
+++ b/data/presets/presets/craft/basket_maker.json
@@ -1,23 +1,20 @@
 {
-    "name": "Basket Maker",
+    "icon": "art-gallery",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "basket",
-        "basketry",
-        "basket maker",
-        "basket weaver"
+        "basket*"
     ],
     "tags": {
         "craft": "basket_maker"
     },
-    "icon": "art-gallery",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Basket Maker"
 }
diff --git a/data/presets/presets/craft/beekeeper.json b/data/presets/presets/craft/beekeeper.json
index cf7c9eda6..26bc85b2d 100644
--- a/data/presets/presets/craft/beekeeper.json
+++ b/data/presets/presets/craft/beekeeper.json
@@ -1,22 +1,20 @@
 {
-    "name": "Beekeeper",
+    "icon": "farm",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "bees",
-        "beekeeper",
-        "bee box"
+        "bee*"
     ],
     "tags": {
         "craft": "beekeeper"
     },
-    "icon": "farm",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Beekeeper"
 }
diff --git a/data/presets/presets/craft/blacksmith.json b/data/presets/presets/craft/blacksmith.json
index 4bf0086af..d36f52fdc 100644
--- a/data/presets/presets/craft/blacksmith.json
+++ b/data/presets/presets/craft/blacksmith.json
@@ -1,5 +1,11 @@
 {
-    "name": "Blacksmith",
+    "icon": "farm",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "blacksmith"
     },
-    "icon": "farm",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Blacksmith"
 }
diff --git a/data/presets/presets/craft/boatbuilder.json b/data/presets/presets/craft/boatbuilder.json
index aeaf0898d..80ef133b1 100644
--- a/data/presets/presets/craft/boatbuilder.json
+++ b/data/presets/presets/craft/boatbuilder.json
@@ -1,5 +1,11 @@
 {
-    "name": "Boat Builder",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "boatbuilder"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Boat Builder"
 }
diff --git a/data/presets/presets/craft/bookbinder.json b/data/presets/presets/craft/bookbinder.json
index 03eaea88c..deb1b11e7 100644
--- a/data/presets/presets/craft/bookbinder.json
+++ b/data/presets/presets/craft/bookbinder.json
@@ -1,5 +1,11 @@
 {
-    "name": "Bookbinder",
+    "icon": "library",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -11,11 +17,5 @@
     "tags": {
         "craft": "bookbinder"
     },
-    "icon": "library",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Bookbinder"
 }
diff --git a/data/presets/presets/craft/brewery.json b/data/presets/presets/craft/brewery.json
index 4f6f95be6..7d81b5682 100644
--- a/data/presets/presets/craft/brewery.json
+++ b/data/presets/presets/craft/brewery.json
@@ -1,5 +1,11 @@
 {
-    "name": "Brewery",
+    "icon": "beer",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "brewery"
     },
-    "icon": "beer",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Brewery"
 }
diff --git a/data/presets/presets/craft/carpenter.json b/data/presets/presets/craft/carpenter.json
index e2eb6ab5b..d0f994bcb 100644
--- a/data/presets/presets/craft/carpenter.json
+++ b/data/presets/presets/craft/carpenter.json
@@ -1,5 +1,11 @@
 {
-    "name": "Carpenter",
+    "icon": "logging",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -11,11 +17,5 @@
     "tags": {
         "craft": "carpenter"
     },
-    "icon": "logging",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Carpenter"
 }
diff --git a/data/presets/presets/craft/carpet_layer.json b/data/presets/presets/craft/carpet_layer.json
index 6130d0408..dbaf45d46 100644
--- a/data/presets/presets/craft/carpet_layer.json
+++ b/data/presets/presets/craft/carpet_layer.json
@@ -1,5 +1,11 @@
 {
-    "name": "Carpet Layer",
+    "icon": "square",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "carpet_layer"
     },
-    "icon": "square",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Carpet Layer"
 }
diff --git a/data/presets/presets/craft/caterer.json b/data/presets/presets/craft/caterer.json
index e838433a5..56de72b27 100644
--- a/data/presets/presets/craft/caterer.json
+++ b/data/presets/presets/craft/caterer.json
@@ -1,22 +1,21 @@
 {
-    "name": "Caterer",
+    "icon": "bakery",
+    "fields": [
+        "cuisine",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "Caterer",
-        "Catering"
+        "cater*"
     ],
     "tags": {
         "craft": "caterer"
     },
-    "icon": "bakery",
-    "fields": [
-        "cuisine",
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Caterer"
 }
diff --git a/data/presets/presets/craft/clockmaker.json b/data/presets/presets/craft/clockmaker.json
index 10b6b1b70..2c9524737 100644
--- a/data/presets/presets/craft/clockmaker.json
+++ b/data/presets/presets/craft/clockmaker.json
@@ -1,22 +1,20 @@
 {
-    "name": "Clockmaker",
+    "icon": "circle-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "clock",
-        "clockmaker",
-        "clock repair"
+        "clock*"
     ],
     "tags": {
         "craft": "clockmaker"
     },
-    "icon": "circle-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Clockmaker"
 }
diff --git a/data/presets/presets/craft/confectionary.json b/data/presets/presets/craft/confectionary.json
index a9f4f046c..f15e4c5c9 100644
--- a/data/presets/presets/craft/confectionary.json
+++ b/data/presets/presets/craft/confectionary.json
@@ -1,5 +1,11 @@
 {
-    "name": "Confectionary",
+    "icon": "bakery",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -12,11 +18,5 @@
     "tags": {
         "craft": "confectionary"
     },
-    "icon": "bakery",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Confectionary"
 }
diff --git a/data/presets/presets/craft/dressmaker.json b/data/presets/presets/craft/dressmaker.json
index 7f938d926..7c9a1322c 100644
--- a/data/presets/presets/craft/dressmaker.json
+++ b/data/presets/presets/craft/dressmaker.json
@@ -1,5 +1,11 @@
 {
-    "name": "Dressmaker",
+    "icon": "clothing-store",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -11,11 +17,5 @@
     "tags": {
         "craft": "dressmaker"
     },
-    "icon": "clothing-store",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Dressmaker"
 }
diff --git a/data/presets/presets/craft/electrician.json b/data/presets/presets/craft/electrician.json
index dce2361bd..d16986210 100644
--- a/data/presets/presets/craft/electrician.json
+++ b/data/presets/presets/craft/electrician.json
@@ -1,5 +1,11 @@
 {
-    "name": "Electrician",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "electrician"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Electrician"
 }
diff --git a/data/presets/presets/craft/gardener.json b/data/presets/presets/craft/gardener.json
index 9aeece182..58ce4762e 100644
--- a/data/presets/presets/craft/gardener.json
+++ b/data/presets/presets/craft/gardener.json
@@ -1,5 +1,11 @@
 {
-    "name": "Gardener",
+    "icon": "garden",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -12,11 +18,5 @@
     "tags": {
         "craft": "gardener"
     },
-    "icon": "garden",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Gardener"
 }
diff --git a/data/presets/presets/craft/glaziery.json b/data/presets/presets/craft/glaziery.json
index 9d12af920..ff413b681 100644
--- a/data/presets/presets/craft/glaziery.json
+++ b/data/presets/presets/craft/glaziery.json
@@ -1,5 +1,11 @@
 {
-    "name": "Glaziery",
+    "icon": "fire-station",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -13,11 +19,5 @@
     "tags": {
         "craft": "glaziery"
     },
-    "icon": "fire-station",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Glaziery"
 }
diff --git a/data/presets/presets/craft/handicraft.json b/data/presets/presets/craft/handicraft.json
index 9e46b1e98..bcb9833ea 100644
--- a/data/presets/presets/craft/handicraft.json
+++ b/data/presets/presets/craft/handicraft.json
@@ -1,5 +1,11 @@
 {
-    "name": "Handicraft",
+    "icon": "art-gallery",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "handicraft"
     },
-    "icon": "art-gallery",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Handicraft"
 }
diff --git a/data/presets/presets/craft/hvac.json b/data/presets/presets/craft/hvac.json
index a9cd533b5..a36540cb2 100644
--- a/data/presets/presets/craft/hvac.json
+++ b/data/presets/presets/craft/hvac.json
@@ -1,24 +1,23 @@
 {
-    "name": "HVAC",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "heating",
-        "ventilating",
+        "heat*",
+        "vent*",
         "air-conditioning",
         "air conditioning"
-        
     ],
     "tags": {
         "craft": "hvac"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "HVAC"
 }
diff --git a/data/presets/presets/craft/insulator.json b/data/presets/presets/craft/insulator.json
index c51a429dd..38dcf89dc 100644
--- a/data/presets/presets/craft/insulator.json
+++ b/data/presets/presets/craft/insulator.json
@@ -1,22 +1,20 @@
 {
-    "name": "Insulator",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "insulation",
-        "insulator"
-        
+        "insulat*"
     ],
     "tags": {
         "craft": "insulation"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Insulator"
 }
diff --git a/data/presets/presets/craft/jeweler.json b/data/presets/presets/craft/jeweler.json
index 25989976a..1f795d88f 100644
--- a/data/presets/presets/craft/jeweler.json
+++ b/data/presets/presets/craft/jeweler.json
@@ -1,5 +1,11 @@
 {
-    "name": "Jeweler",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -12,12 +18,6 @@
     "tags": {
         "craft": "jeweler"
     },
-    "icon": "marker-stroked",
-    "searchable": false,
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Jeweler",
+    "searchable": false
 }
diff --git a/data/presets/presets/craft/key_cutter.json b/data/presets/presets/craft/key_cutter.json
index b62c713a5..3e667d2ac 100644
--- a/data/presets/presets/craft/key_cutter.json
+++ b/data/presets/presets/craft/key_cutter.json
@@ -1,21 +1,20 @@
 {
-    "name": "Key Cutter",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "key",
-        "key cutter"
+        "key*"
     ],
     "tags": {
         "craft": "key_cutter"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Key Cutter"
 }
diff --git a/data/presets/presets/craft/locksmith.json b/data/presets/presets/craft/locksmith.json
index 3c6d98928..6ee6c84a8 100644
--- a/data/presets/presets/craft/locksmith.json
+++ b/data/presets/presets/craft/locksmith.json
@@ -1,22 +1,21 @@
 {
-    "name": "Locksmith",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "locksmith",
-        "lock"
+        "lock*"
     ],
     "tags": {
         "craft": "locksmith"
     },
-    "icon": "marker-stroked",
-    "searchable": false,
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Locksmith",
+    "searchable": false
 }
diff --git a/data/presets/presets/craft/metal_construction.json b/data/presets/presets/craft/metal_construction.json
index 0ef5c64d7..6c533304c 100644
--- a/data/presets/presets/craft/metal_construction.json
+++ b/data/presets/presets/craft/metal_construction.json
@@ -1,5 +1,11 @@
 {
-    "name": "Metal Construction",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "metal_construction"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Metal Construction"
 }
diff --git a/data/presets/presets/craft/optician.json b/data/presets/presets/craft/optician.json
index dc5db0a25..2772c512a 100644
--- a/data/presets/presets/craft/optician.json
+++ b/data/presets/presets/craft/optician.json
@@ -1,5 +1,11 @@
 {
-    "name": "Optician",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -11,12 +17,6 @@
     "tags": {
         "craft": "optician"
     },
-    "icon": "marker-stroked",
-    "searchable": false,
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Optician",
+    "searchable": false
 }
diff --git a/data/presets/presets/craft/painter.json b/data/presets/presets/craft/painter.json
index c48a8862c..f69a16bb8 100644
--- a/data/presets/presets/craft/painter.json
+++ b/data/presets/presets/craft/painter.json
@@ -1,5 +1,11 @@
 {
-    "name": "Painter",
+    "icon": "art-gallery",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "painter"
     },
-    "icon": "art-gallery",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Painter"
 }
diff --git a/data/presets/presets/craft/photographer.json b/data/presets/presets/craft/photographer.json
index 502c170b9..453feca9e 100644
--- a/data/presets/presets/craft/photographer.json
+++ b/data/presets/presets/craft/photographer.json
@@ -1,5 +1,11 @@
 {
-    "name": "Photographer",
+    "icon": "camera",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "photographer"
     },
-    "icon": "camera",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Photographer"
 }
diff --git a/data/presets/presets/craft/photographic_laboratory.json b/data/presets/presets/craft/photographic_laboratory.json
index 4b2587427..58842e495 100644
--- a/data/presets/presets/craft/photographic_laboratory.json
+++ b/data/presets/presets/craft/photographic_laboratory.json
@@ -1,21 +1,21 @@
 {
-    "name": "Photographic Laboratory",
+    "icon": "camera",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "photographic laboratory",
-        "film developer"
+        "photo*",
+        "film"
     ],
     "tags": {
         "craft": "photographic_laboratory"
     },
-    "icon": "camera",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Photographic Laboratory"
 }
diff --git a/data/presets/presets/craft/plasterer.json b/data/presets/presets/craft/plasterer.json
index 40cda760d..ea1625897 100644
--- a/data/presets/presets/craft/plasterer.json
+++ b/data/presets/presets/craft/plasterer.json
@@ -1,5 +1,11 @@
 {
-    "name": "Plasterer",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "plasterer"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Plasterer"
 }
diff --git a/data/presets/presets/craft/plumber.json b/data/presets/presets/craft/plumber.json
index 9bddd3e44..d7bcfe3d2 100644
--- a/data/presets/presets/craft/plumber.json
+++ b/data/presets/presets/craft/plumber.json
@@ -1,5 +1,11 @@
 {
-    "name": "Plumber",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "plumber"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Plumber"
 }
diff --git a/data/presets/presets/craft/pottery.json b/data/presets/presets/craft/pottery.json
index da8b245ab..f07b6ae56 100644
--- a/data/presets/presets/craft/pottery.json
+++ b/data/presets/presets/craft/pottery.json
@@ -1,21 +1,21 @@
 {
-    "name": "Pottery",
+    "icon": "art-gallery",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "pottery",
-        "potter"
+        "potter*",
+        "ceramic*"
     ],
     "tags": {
         "craft": "pottery"
     },
-    "icon": "art-gallery",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Pottery"
 }
diff --git a/data/presets/presets/craft/rigger.json b/data/presets/presets/craft/rigger.json
index 2bd3427e9..06bac0171 100644
--- a/data/presets/presets/craft/rigger.json
+++ b/data/presets/presets/craft/rigger.json
@@ -1,5 +1,11 @@
 {
-    "name": "Rigger",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "rigger"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Rigger"
 }
diff --git a/data/presets/presets/craft/roofer.json b/data/presets/presets/craft/roofer.json
index 6e671d3e4..c656e055a 100644
--- a/data/presets/presets/craft/roofer.json
+++ b/data/presets/presets/craft/roofer.json
@@ -1,5 +1,11 @@
 {
-    "name": "Roofer",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "roofer"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Roofer"
 }
diff --git a/data/presets/presets/craft/saddler.json b/data/presets/presets/craft/saddler.json
index 66dc08320..e3e23da7d 100644
--- a/data/presets/presets/craft/saddler.json
+++ b/data/presets/presets/craft/saddler.json
@@ -1,20 +1,20 @@
 {
-    "name": "Saddler",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "saddler"
+        "saddle*"
     ],
     "tags": {
         "craft": "saddler"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Saddler"
 }
diff --git a/data/presets/presets/craft/sailmaker.json b/data/presets/presets/craft/sailmaker.json
index a6b46868e..3b882bb90 100644
--- a/data/presets/presets/craft/sailmaker.json
+++ b/data/presets/presets/craft/sailmaker.json
@@ -1,20 +1,20 @@
 {
-    "name": "Sailmaker",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "sailmaker"
+        "sail*"
     ],
     "tags": {
         "craft": "sailmaker"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Sailmaker"
 }
diff --git a/data/presets/presets/craft/sawmill.json b/data/presets/presets/craft/sawmill.json
index 6bb9b89e4..90f7b1577 100644
--- a/data/presets/presets/craft/sawmill.json
+++ b/data/presets/presets/craft/sawmill.json
@@ -1,5 +1,11 @@
 {
-    "name": "Sawmill",
+    "icon": "park",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -11,11 +17,5 @@
     "tags": {
         "craft": "sawmill"
     },
-    "icon": "park",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Sawmill"
 }
diff --git a/data/presets/presets/craft/scaffolder.json b/data/presets/presets/craft/scaffolder.json
index 317fef411..e66fe4ff0 100644
--- a/data/presets/presets/craft/scaffolder.json
+++ b/data/presets/presets/craft/scaffolder.json
@@ -1,5 +1,11 @@
 {
-    "name": "Scaffolder",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "scaffolder"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Scaffolder"
 }
diff --git a/data/presets/presets/craft/sculpter.json b/data/presets/presets/craft/sculpter.json
index 04e55c8b3..1268ea1ae 100644
--- a/data/presets/presets/craft/sculpter.json
+++ b/data/presets/presets/craft/sculpter.json
@@ -1,5 +1,11 @@
 {
-    "name": "Sculpter",
+    "icon": "art-gallery",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "sculpter"
     },
-    "icon": "art-gallery",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Sculpter"
 }
diff --git a/data/presets/presets/craft/shoemaker.json b/data/presets/presets/craft/shoemaker.json
index 2ba956c69..8fe198efb 100644
--- a/data/presets/presets/craft/shoemaker.json
+++ b/data/presets/presets/craft/shoemaker.json
@@ -1,5 +1,11 @@
 {
-    "name": "Shoemaker",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -11,11 +17,5 @@
     "tags": {
         "craft": "shoemaker"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Shoemaker"
 }
diff --git a/data/presets/presets/craft/stonemason.json b/data/presets/presets/craft/stonemason.json
index 3f2bde5cc..c57bc6a9b 100644
--- a/data/presets/presets/craft/stonemason.json
+++ b/data/presets/presets/craft/stonemason.json
@@ -1,5 +1,11 @@
 {
-    "name": "Stonemason",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -11,11 +17,5 @@
     "tags": {
         "craft": "stonemason"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Stonemason"
 }
diff --git a/data/presets/presets/craft/sweep.json b/data/presets/presets/craft/sweep.json
index 479a5cb65..f683739dc 100644
--- a/data/presets/presets/craft/sweep.json
+++ b/data/presets/presets/craft/sweep.json
@@ -1,21 +1,21 @@
 {
-    "name": "Chimney Sweep",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
         "sweep",
-        "chimney sweep"
+        "chimney"
     ],
     "tags": {
         "craft": "sweep"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Chimney Sweep"
 }
diff --git a/data/presets/presets/craft/tailor.json b/data/presets/presets/craft/tailor.json
index cf70706b2..8898c6bcf 100644
--- a/data/presets/presets/craft/tailor.json
+++ b/data/presets/presets/craft/tailor.json
@@ -1,5 +1,11 @@
 {
-    "name": "Tailor",
+    "icon": "clothing-store",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -11,12 +17,5 @@
     "tags": {
         "craft": "tailor"
     },
-    "icon": "clothing-store",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ],
-    "searchable": false
+    "name": "Tailor"
 }
diff --git a/data/presets/presets/craft/tiler.json b/data/presets/presets/craft/tiler.json
index 3d73c6be0..02fcfce57 100644
--- a/data/presets/presets/craft/tiler.json
+++ b/data/presets/presets/craft/tiler.json
@@ -1,5 +1,11 @@
 {
-    "name": "Tiler",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "tiler"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Tiler"
 }
diff --git a/data/presets/presets/craft/tinsmith b/data/presets/presets/craft/tinsmith
deleted file mode 100644
index ee471afde..000000000
--- a/data/presets/presets/craft/tinsmith
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "name": "Tinsmith",
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "terms": [
-        "tinsmith"
-    ],
-    "tags": {
-        "craft": "tinsmith"
-    },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
-}
diff --git a/data/presets/presets/craft/tinsmith.json b/data/presets/presets/craft/tinsmith.json
index ee471afde..3068a1cce 100644
--- a/data/presets/presets/craft/tinsmith.json
+++ b/data/presets/presets/craft/tinsmith.json
@@ -1,5 +1,11 @@
 {
-    "name": "Tinsmith",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "tinsmith"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Tinsmith"
 }
diff --git a/data/presets/presets/craft/upholsterer.json b/data/presets/presets/craft/upholsterer.json
index c6e5dee00..1d0a65913 100644
--- a/data/presets/presets/craft/upholsterer.json
+++ b/data/presets/presets/craft/upholsterer.json
@@ -1,5 +1,11 @@
 {
-    "name": "Upholsterer",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,11 +16,5 @@
     "tags": {
         "craft": "upholsterer"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Upholsterer"
 }
diff --git a/data/presets/presets/craft/watchmaker.json b/data/presets/presets/craft/watchmaker.json
index 091f04d9d..0cd6a58ad 100644
--- a/data/presets/presets/craft/watchmaker.json
+++ b/data/presets/presets/craft/watchmaker.json
@@ -1,22 +1,20 @@
 {
-    "name": "Watchmaker",
+    "icon": "circle-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "watch",
-        "watchmaker",
-        "watch repair"
+        "watch*"
     ],
     "tags": {
         "craft": "watchmaker"
     },
-    "icon": "circle-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Watchmaker"
 }
diff --git a/data/presets/presets/craft/window_construction.json b/data/presets/presets/craft/window_construction.json
index ccc4ae031..393ceedc8 100644
--- a/data/presets/presets/craft/window_construction.json
+++ b/data/presets/presets/craft/window_construction.json
@@ -1,22 +1,20 @@
 {
-    "name": "Window Construction",
+    "icon": "marker-stroked",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "window",
-        "window maker",
-        "window construction"
+        "window*"
     ],
     "tags": {
         "craft": "window_construction"
     },
-    "icon": "marker-stroked",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "name": "Window Construction"
 }
diff --git a/data/presets/presets/emergency/ambulance_station.json b/data/presets/presets/emergency/ambulance_station.json
index b7b624db8..68e0d2558 100644
--- a/data/presets/presets/emergency/ambulance_station.json
+++ b/data/presets/presets/emergency/ambulance_station.json
@@ -1,6 +1,9 @@
 {
+    "icon": "hospital",
     "fields": [
-        "operator"
+        "operator",
+        "building_area",
+        "address"
     ],
     "geometry": [
         "area",
diff --git a/data/presets/presets/leisure/dog_park.json b/data/presets/presets/leisure/dog_park.json
index de2b301f0..0f4e662de 100644
--- a/data/presets/presets/leisure/dog_park.json
+++ b/data/presets/presets/leisure/dog_park.json
@@ -1,4 +1,5 @@
 {
+    "icon": "dog-park",
     "geometry": [
         "point",
         "area"
@@ -8,6 +9,5 @@
     "tags": {
         "leisure": "dog_park"
     },
-    "name": "Dog Park",
-    "icon": "dog-park"
+    "name": "Dog Park"
 }
diff --git a/data/presets/presets/leisure/golf_course.json b/data/presets/presets/leisure/golf_course.json
index 18b463b8d..246e545ee 100644
--- a/data/presets/presets/leisure/golf_course.json
+++ b/data/presets/presets/leisure/golf_course.json
@@ -2,17 +2,18 @@
     "icon": "golf",
     "fields": [
         "operator",
-        "address"
+        "address",
+        "opening_hours"
     ],
     "geometry": [
         "point",
         "area"
     ],
-    "tags": {
-        "leisure": "golf_course"
-    },
     "terms": [
         "links"
     ],
+    "tags": {
+        "leisure": "golf_course"
+    },
     "name": "Golf Course"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/leisure/ice_rink.json b/data/presets/presets/leisure/ice_rink.json
index 6eff84241..fc01d1a9c 100644
--- a/data/presets/presets/leisure/ice_rink.json
+++ b/data/presets/presets/leisure/ice_rink.json
@@ -1,9 +1,12 @@
 {
     "icon": "pitch",
     "fields": [
-        "building_area",
         "seasonal",
-        "sport_ice"
+        "sport_ice",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/playground.json b/data/presets/presets/leisure/playground.json
index 60fd41518..d1d19f4de 100644
--- a/data/presets/presets/leisure/playground.json
+++ b/data/presets/presets/leisure/playground.json
@@ -4,12 +4,12 @@
         "point",
         "area"
     ],
-    "tags": {
-        "leisure": "playground"
-    },
-    "name": "Playground",
     "terms": [
         "jungle gym",
         "play area"
-    ]
-}
\ No newline at end of file
+    ],
+    "tags": {
+        "leisure": "playground"
+    },
+    "name": "Playground"
+}
diff --git a/data/presets/presets/leisure/sports_center.json b/data/presets/presets/leisure/sports_center.json
index 875901a6d..a751bd499 100644
--- a/data/presets/presets/leisure/sports_center.json
+++ b/data/presets/presets/leisure/sports_center.json
@@ -1,5 +1,11 @@
 {
     "icon": "pitch",
+    "fields": [
+        "sport",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,8 +16,5 @@
     "terms": [
         "gym"
     ],
-    "fields": [
-        "sport"
-    ],
     "name": "Sports Center / Gym"
 }
diff --git a/data/presets/presets/leisure/stadium.json b/data/presets/presets/leisure/stadium.json
index d62faa032..a3e820695 100644
--- a/data/presets/presets/leisure/stadium.json
+++ b/data/presets/presets/leisure/stadium.json
@@ -1,5 +1,9 @@
 {
     "icon": "pitch",
+    "fields": [
+        "sport",
+        "address"
+    ],
     "geometry": [
         "point",
         "area"
@@ -7,8 +11,5 @@
     "tags": {
         "leisure": "stadium"
     },
-    "fields": [
-        "sport"
-    ],
     "name": "Stadium"
 }
diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json
index 09c0dc26e..5640caa40 100644
--- a/data/presets/presets/leisure/swimming_pool.json
+++ b/data/presets/presets/leisure/swimming_pool.json
@@ -1,6 +1,8 @@
 {
     "fields": [
-        "access_simple"
+        "access_simple",
+        "operator",
+        "address"
     ],
     "geometry": [
         "point",
@@ -12,4 +14,4 @@
     },
     "icon": "swimming",
     "name": "Swimming Pool"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/man_made/lighthouse.json b/data/presets/presets/man_made/lighthouse.json
index 65824061d..cfc9d0bac 100644
--- a/data/presets/presets/man_made/lighthouse.json
+++ b/data/presets/presets/man_made/lighthouse.json
@@ -1,4 +1,5 @@
 {
+    "icon": "lighthouse",
     "geometry": [
         "point",
         "area"
@@ -6,6 +7,5 @@
     "tags": {
         "man_made": "lighthouse"
     },
-    "name": "Lighthouse",
-    "icon": "lighthouse"
+    "name": "Lighthouse"
 }
diff --git a/data/presets/presets/man_made/pipeline.json b/data/presets/presets/man_made/pipeline.json
index 62b3c5d53..e74676f3b 100644
--- a/data/presets/presets/man_made/pipeline.json
+++ b/data/presets/presets/man_made/pipeline.json
@@ -1,14 +1,14 @@
 {
+    "icon": "pipeline",
+    "fields": [
+        "location",
+        "operator"
+    ],
     "geometry": [
         "line"
     ],
     "tags": {
         "man_made": "pipeline"
     },
-    "fields": [
-        "location",
-        "operator"
-    ],
-    "name": "Pipeline",
-    "icon": "pipeline"
+    "name": "Pipeline"
 }
diff --git a/data/presets/presets/man_made/survey_point.json b/data/presets/presets/man_made/survey_point.json
index cbf197341..703d7e44a 100644
--- a/data/presets/presets/man_made/survey_point.json
+++ b/data/presets/presets/man_made/survey_point.json
@@ -1,5 +1,8 @@
 {
     "icon": "monument",
+    "fields": [
+        "ref"
+    ],
     "geometry": [
         "point",
         "vertex"
@@ -7,8 +10,5 @@
     "tags": {
         "man_made": "survey_point"
     },
-    "fields": [
-        "ref"
-    ],
     "name": "Survey Point"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/man_made/tower.json b/data/presets/presets/man_made/tower.json
index ccf2ba81f..e2285df23 100644
--- a/data/presets/presets/man_made/tower.json
+++ b/data/presets/presets/man_made/tower.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "towertype"
+    ],
     "geometry": [
         "point",
         "area"
@@ -6,8 +9,5 @@
     "tags": {
         "man_made": "tower"
     },
-    "fields": [
-        "towertype"
-    ],
     "name": "Tower"
 }
diff --git a/data/presets/presets/man_made/wastewater_plant.json b/data/presets/presets/man_made/wastewater_plant.json
index f94d40747..1dec9fa58 100644
--- a/data/presets/presets/man_made/wastewater_plant.json
+++ b/data/presets/presets/man_made/wastewater_plant.json
@@ -1,17 +1,20 @@
 {
     "icon": "water",
-    "geometry": [
+    "fields": [
+        "operator",
+        "address"
+    ],
+   "geometry": [
         "point",
         "area"
     ],
+    "terms": [
+        "sewage*",
+        "water treatment plant",
+        "reclamation plant"
+    ],
     "tags": {
         "man_made": "wastewater_plant"
     },
-    "name": "Wastewater Plant",
-    "terms": [
-        "sewage works",
-        "sewage treatment plant",
-        "water treatment plant",
-        "reclamation plant"
-    ]
-}
\ No newline at end of file
+    "name": "Wastewater Plant"
+}
diff --git a/data/presets/presets/man_made/water_tower.json b/data/presets/presets/man_made/water_tower.json
index fbfc258c7..3baefd56d 100644
--- a/data/presets/presets/man_made/water_tower.json
+++ b/data/presets/presets/man_made/water_tower.json
@@ -1,5 +1,8 @@
 {
     "icon": "water",
+    "fields": [
+        "operator"
+    ],
     "geometry": [
         "point",
         "area"
@@ -8,4 +11,4 @@
         "man_made": "water_tower"
     },
     "name": "Water Tower"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/man_made/water_well.json b/data/presets/presets/man_made/water_well.json
index 4627743a0..a45d9db70 100644
--- a/data/presets/presets/man_made/water_well.json
+++ b/data/presets/presets/man_made/water_well.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "operator"
+    ],
     "geometry": [
         "point",
         "area"
@@ -6,5 +9,5 @@
     "tags": {
         "man_made": "water_well"
     },
-    "name": "Water well"
+    "name": "Water Well"
 }
diff --git a/data/presets/presets/man_made/water_works.json b/data/presets/presets/man_made/water_works.json
index bff78860e..be98ac800 100644
--- a/data/presets/presets/man_made/water_works.json
+++ b/data/presets/presets/man_made/water_works.json
@@ -1,5 +1,9 @@
 {
     "icon": "water",
+    "fields": [
+        "operator",
+        "address"
+    ],
     "geometry": [
         "point",
         "area"
@@ -8,4 +12,4 @@
         "man_made": "water_works"
     },
     "name": "Water Works"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/military/airfield.json b/data/presets/presets/military/airfield.json
index 330ff93f7..7cde1e8ce 100644
--- a/data/presets/presets/military/airfield.json
+++ b/data/presets/presets/military/airfield.json
@@ -1,13 +1,13 @@
 {
+    "icon": "airfield",
     "geometry": [
         "point",
         "vertex",
         "area"
     ],
+    "terms": [],
     "tags": {
         "military": "airfield"
     },
-    "terms": [],
-    "name": "Airfield",
-    "icon": "airfield"
-}
\ No newline at end of file
+    "name": "Airfield"
+}
diff --git a/data/presets/presets/military/barracks.json b/data/presets/presets/military/barracks.json
index 991160b21..1e5281e64 100644
--- a/data/presets/presets/military/barracks.json
+++ b/data/presets/presets/military/barracks.json
@@ -4,9 +4,9 @@
         "vertex",
         "area"
     ],
+    "terms": [],
     "tags": {
         "military": "barracks"
     },
-    "terms": [],
     "name": "Barracks"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/military/bunker.json b/data/presets/presets/military/bunker.json
index 82706b65d..fef0f0f11 100644
--- a/data/presets/presets/military/bunker.json
+++ b/data/presets/presets/military/bunker.json
@@ -4,9 +4,9 @@
         "vertex",
         "area"
     ],
+    "terms": [],
     "tags": {
         "military": "bunker"
     },
-    "terms": [],
     "name": "Bunker"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/military/range.json b/data/presets/presets/military/range.json
index 411f02b00..b1e61deb7 100644
--- a/data/presets/presets/military/range.json
+++ b/data/presets/presets/military/range.json
@@ -4,9 +4,9 @@
         "vertex",
         "area"
     ],
+    "terms": [],
     "tags": {
         "military": "range"
     },
-    "terms": [],
     "name": "Military Range"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json
index b301d3519..c91fe3581 100644
--- a/data/presets/presets/office.json
+++ b/data/presets/presets/office.json
@@ -3,6 +3,7 @@
     "fields": [
         "office",
         "address",
+        "building_area",
         "opening_hours",
         "smoking"
     ],
diff --git a/data/presets/presets/office/accountant.json b/data/presets/presets/office/accountant.json
index ad81eeef3..515782e36 100644
--- a/data/presets/presets/office/accountant.json
+++ b/data/presets/presets/office/accountant.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Accountant"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/administrative.json b/data/presets/presets/office/administrative.json
index 97fb63449..52a61cf14 100644
--- a/data/presets/presets/office/administrative.json
+++ b/data/presets/presets/office/administrative.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Administrative Office"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/architect.json b/data/presets/presets/office/architect.json
index 3022e26af..66473d74f 100644
--- a/data/presets/presets/office/architect.json
+++ b/data/presets/presets/office/architect.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Architect"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/company.json b/data/presets/presets/office/company.json
index 2826cce55..b56565af0 100644
--- a/data/presets/presets/office/company.json
+++ b/data/presets/presets/office/company.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours",
         "smoking"
     ],
diff --git a/data/presets/presets/office/educational_institution.json b/data/presets/presets/office/educational_institution.json
index 3bf9a8f8e..bb34445cb 100644
--- a/data/presets/presets/office/educational_institution.json
+++ b/data/presets/presets/office/educational_institution.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Educational Institution"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/employment_agency.json b/data/presets/presets/office/employment_agency.json
index f09d91652..5e9204f9e 100644
--- a/data/presets/presets/office/employment_agency.json
+++ b/data/presets/presets/office/employment_agency.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -12,6 +13,8 @@
     "tags": {
         "office": "employment_agency"
     },
-    "terms": [],
+    "terms": [
+        "job"
+    ],
     "name": "Employment Agency"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/estate_agent.json b/data/presets/presets/office/estate_agent.json
index a664217ce..117a9550f 100644
--- a/data/presets/presets/office/estate_agent.json
+++ b/data/presets/presets/office/estate_agent.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Real Estate Office"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/financial.json b/data/presets/presets/office/financial.json
index ca34644d1..678fe38f3 100644
--- a/data/presets/presets/office/financial.json
+++ b/data/presets/presets/office/financial.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Financial Office"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/government.json b/data/presets/presets/office/government.json
index 2ef26e67c..eb13a4a7b 100644
--- a/data/presets/presets/office/government.json
+++ b/data/presets/presets/office/government.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Government Office"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/insurance.json b/data/presets/presets/office/insurance.json
index 248871a5c..beb761b98 100644
--- a/data/presets/presets/office/insurance.json
+++ b/data/presets/presets/office/insurance.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Insurance Office"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/it.json b/data/presets/presets/office/it.json
index 466a53204..d13df9efb 100644
--- a/data/presets/presets/office/it.json
+++ b/data/presets/presets/office/it.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "IT Office"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/lawyer.json b/data/presets/presets/office/lawyer.json
index a042121f5..438b07035 100644
--- a/data/presets/presets/office/lawyer.json
+++ b/data/presets/presets/office/lawyer.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Law Office"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/newspaper.json b/data/presets/presets/office/newspaper.json
index d27138313..bf2201f5a 100644
--- a/data/presets/presets/office/newspaper.json
+++ b/data/presets/presets/office/newspaper.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Newspaper"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/ngo.json b/data/presets/presets/office/ngo.json
index 15a2ca009..74f25d926 100644
--- a/data/presets/presets/office/ngo.json
+++ b/data/presets/presets/office/ngo.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours",
         "smoking"
     ],
diff --git a/data/presets/presets/office/physician.json b/data/presets/presets/office/physician.json
index 370d132bc..db600e379 100644
--- a/data/presets/presets/office/physician.json
+++ b/data/presets/presets/office/physician.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Physician"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/political_party.json b/data/presets/presets/office/political_party.json
index e003773fc..b546f3ff6 100644
--- a/data/presets/presets/office/political_party.json
+++ b/data/presets/presets/office/political_party.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Political Party"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/research.json b/data/presets/presets/office/research.json
index 84af3a98b..d03b9ed74 100644
--- a/data/presets/presets/office/research.json
+++ b/data/presets/presets/office/research.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Research Office"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/telecommunication.json b/data/presets/presets/office/telecommunication.json
index 429f8b33a..6e432eca2 100644
--- a/data/presets/presets/office/telecommunication.json
+++ b/data/presets/presets/office/telecommunication.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Telecom Office"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/therapist.json b/data/presets/presets/office/therapist.json
index defc7ac33..c08dc4e93 100644
--- a/data/presets/presets/office/therapist.json
+++ b/data/presets/presets/office/therapist.json
@@ -2,6 +2,7 @@
     "icon": "commercial",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -14,4 +15,4 @@
     },
     "terms": [],
     "name": "Therapist"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/office/travel_agent.json b/data/presets/presets/office/travel_agent.json
index 9637f0c82..2e06e4339 100644
--- a/data/presets/presets/office/travel_agent.json
+++ b/data/presets/presets/office/travel_agent.json
@@ -2,6 +2,7 @@
     "icon": "suitcase",
     "fields": [
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -15,4 +16,4 @@
     "terms": [],
     "name": "Travel Agency",
     "searchable": false
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/power/generator.json b/data/presets/presets/power/generator.json
index 8d48dc57b..22c9dbf02 100644
--- a/data/presets/presets/power/generator.json
+++ b/data/presets/presets/power/generator.json
@@ -1,5 +1,10 @@
 {
-    "name": "Power Generator",
+    "fields": [
+        "operator",
+        "generator/source",
+        "generator/method",
+        "generator/type"
+    ],
     "geometry": [
         "point",
         "vertex",
@@ -8,9 +13,5 @@
     "tags": {
         "power": "generator"
     },
-    "fields": [
-        "generator/source",
-        "generator/method",
-        "generator/type"
-    ]
-}
\ No newline at end of file
+    "name": "Power Generator"
+}
diff --git a/data/presets/presets/railway/station.json b/data/presets/presets/railway/station.json
index 223b4f963..f522ee7b3 100644
--- a/data/presets/presets/railway/station.json
+++ b/data/presets/presets/railway/station.json
@@ -1,6 +1,8 @@
 {
     "icon": "rail",
     "fields": [
+        "operator",
+        "address",
         "building_area"
     ],
     "geometry": [
diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json
index fc046a20b..895b83d7c 100644
--- a/data/presets/presets/shop.json
+++ b/data/presets/presets/shop.json
@@ -3,6 +3,7 @@
     "fields": [
         "shop",
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -15,4 +16,4 @@
     },
     "terms": [],
     "name": "Shop"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/alcohol.json b/data/presets/presets/shop/alcohol.json
index 7839cecd0..37d6f77a3 100644
--- a/data/presets/presets/shop/alcohol.json
+++ b/data/presets/presets/shop/alcohol.json
@@ -10,11 +10,11 @@
         "vertex",
         "area"
     ],
-    "tags": {
-        "shop": "alcohol"
-    },
     "terms": [
         "alcohol"
     ],
+    "tags": {
+        "shop": "alcohol"
+    },
     "name": "Liquor Store"
 }
diff --git a/data/presets/presets/shop/art.json b/data/presets/presets/shop/art.json
index 6a7957435..2f782fe80 100644
--- a/data/presets/presets/shop/art.json
+++ b/data/presets/presets/shop/art.json
@@ -11,8 +11,7 @@
         "area"
     ],
     "terms": [
-        "art store",
-        "art gallery"
+        "art*"
     ],
     "tags": {
         "shop": "art"
diff --git a/data/presets/presets/shop/funeral_directors.json b/data/presets/presets/shop/funeral_directors.json
index fd0421752..6e56e583d 100644
--- a/data/presets/presets/shop/funeral_directors.json
+++ b/data/presets/presets/shop/funeral_directors.json
@@ -11,14 +11,14 @@
         "vertex",
         "area"
     ],
-    "tags": {
-        "shop": "funeral_directors"
-    },
     "terms": [
         "undertaker",
         "funeral parlour",
         "funeral parlor",
         "memorial home"
     ],
+    "tags": {
+        "shop": "funeral_directors"
+    },
     "name": "Funeral Home"
 }
diff --git a/data/presets/presets/shop/locksmith.json b/data/presets/presets/shop/locksmith.json
index fd4e29302..aadcc8c89 100644
--- a/data/presets/presets/shop/locksmith.json
+++ b/data/presets/presets/shop/locksmith.json
@@ -11,10 +11,11 @@
         "area"
     ],
     "terms": [
-        "keys"
+        "key*",
+        "lock*"
     ],
     "tags": {
         "shop": "locksmith"
     },
     "name": "Locksmith"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json
index c901eeadf..eab992b0f 100644
--- a/data/presets/presets/shop/supermarket.json
+++ b/data/presets/presets/shop/supermarket.json
@@ -3,7 +3,8 @@
     "fields": [
         "operator",
         "building_area",
-        "address"
+        "address",
+        "opening_hours"
     ],
     "geometry": [
         "point",
@@ -38,4 +39,4 @@
         "shop": "supermarket"
     },
     "name": "Supermarket"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/tailor.json b/data/presets/presets/shop/tailor.json
index 690df475f..96cbad711 100644
--- a/data/presets/presets/shop/tailor.json
+++ b/data/presets/presets/shop/tailor.json
@@ -1,21 +1,21 @@
 {
-    "name": "Tailor",
+    "icon": "clothing-store",
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
     "geometry": [
         "point",
+        "vertex",
         "area"
     ],
-    "terms": [
-        "tailor",
-        "clothes"
-    ],
     "tags": {
         "shop": "tailor"
     },
-    "icon": "clothing-store",
-    "fields": [
-        "building_area",
-        "address",
-        "operator",
-        "opening_hours"
-    ]
+    "terms": [
+        "tailor",
+        "clothes"
+    ],
+    "name": "Tailor"
 }
diff --git a/data/presets/presets/tourism/alpine_hut.json b/data/presets/presets/tourism/alpine_hut.json
index 0b4452d89..b962c2c00 100644
--- a/data/presets/presets/tourism/alpine_hut.json
+++ b/data/presets/presets/tourism/alpine_hut.json
@@ -2,7 +2,8 @@
     "icon": "lodging",
     "fields": [
         "operator",
-        "address"
+        "address",
+        "building_area"
     ],
     "geometry": [
         "point",
@@ -13,4 +14,4 @@
         "tourism": "alpine_hut"
     },
     "name": "Alpine Hut"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/tourism/artwork.json b/data/presets/presets/tourism/artwork.json
index 878b46ee1..e4c884c62 100644
--- a/data/presets/presets/tourism/artwork.json
+++ b/data/presets/presets/tourism/artwork.json
@@ -1,9 +1,9 @@
 {
+    "icon": "art-gallery",
     "fields": [
         "artwork_type",
         "artist"
     ],
-    "icon": "art-gallery",
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json
index df1b91dd6..34c0c23a5 100644
--- a/data/presets/presets/tourism/chalet.json
+++ b/data/presets/presets/tourism/chalet.json
@@ -2,8 +2,8 @@
     "icon": "lodging",
     "fields": [
         "operator",
-        "building_area",
         "address",
+        "building_area",
         "smoking"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json
index a980b5d71..ea0037b3e 100644
--- a/data/presets/presets/tourism/guest_house.json
+++ b/data/presets/presets/tourism/guest_house.json
@@ -3,6 +3,7 @@
     "fields": [
         "operator",
         "address",
+        "building_area",
         "smoking"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/hostel.json b/data/presets/presets/tourism/hostel.json
index eeac6d508..f85844f3e 100644
--- a/data/presets/presets/tourism/hostel.json
+++ b/data/presets/presets/tourism/hostel.json
@@ -2,8 +2,8 @@
     "icon": "lodging",
     "fields": [
         "operator",
-        "building_area",
         "address",
+        "building_area",
         "smoking"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json
index 38e0765d6..e5ceca24a 100644
--- a/data/presets/presets/tourism/hotel.json
+++ b/data/presets/presets/tourism/hotel.json
@@ -2,8 +2,8 @@
     "icon": "lodging",
     "fields": [
         "operator",
-        "building_area",
         "address",
+        "building_area",
         "smoking"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/information.json b/data/presets/presets/tourism/information.json
index 3c4ac8f5d..7beee9480 100644
--- a/data/presets/presets/tourism/information.json
+++ b/data/presets/presets/tourism/information.json
@@ -1,9 +1,9 @@
 {
     "fields": [
         "information",
-        "building_area",
+        "operator",
         "address",
-        "operator"
+        "building_area"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json
index 6567bead0..9e52053d7 100644
--- a/data/presets/presets/tourism/motel.json
+++ b/data/presets/presets/tourism/motel.json
@@ -2,8 +2,8 @@
     "icon": "lodging",
     "fields": [
         "operator",
-        "building_area",
         "address",
+        "building_area",
         "smoking"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json
index b042e479b..cd4b42164 100644
--- a/data/presets/presets/tourism/museum.json
+++ b/data/presets/presets/tourism/museum.json
@@ -2,8 +2,8 @@
     "icon": "museum",
     "fields": [
         "operator",
-        "building_area",
-        "address"
+        "address",
+        "building_area"
     ],
     "geometry": [
         "point",
@@ -29,4 +29,4 @@
         "tourism": "museum"
     },
     "name": "Museum"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 934849de4..f51b11930 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1243,7 +1243,7 @@
             },
             "amenity/arts_centre": {
                 "name": "Arts Center",
-                "terms": "arts,arts centre"
+                "terms": "art*"
             },
             "amenity/atm": {
                 "name": "ATM",
@@ -1306,8 +1306,8 @@
                 "terms": "EV,Electric Vehicle,Supercharger"
             },
             "amenity/childcare": {
-                "name": "Childcare",
-                "terms": "nursery,orphanage,playgroup"
+                "name": "Nursery/Childcare",
+                "terms": "daycare,nursery,orphanage,playgroup"
             },
             "amenity/cinema": {
                 "name": "Cinema",
@@ -1322,8 +1322,8 @@
                 "terms": ""
             },
             "amenity/college": {
-                "name": "College",
-                "terms": ""
+                "name": "College Grounds",
+                "terms": "college,university"
             },
             "amenity/compressed_air": {
                 "name": "Compressed Air",
@@ -1335,11 +1335,11 @@
             },
             "amenity/dentist": {
                 "name": "Dentist",
-                "terms": "dentist,dentist's office"
+                "terms": "dentist*,tooth,teeth"
             },
             "amenity/doctor": {
                 "name": "Doctor",
-                "terms": "doctor,doctor's office"
+                "terms": "doctor*,medic*"
             },
             "amenity/dojo": {
                 "name": "Dojo / Martial Arts Academy",
@@ -1378,8 +1378,8 @@
                 "terms": "clinic,emergency room,health service,hospice,infirmary,institution,nursing home,rest home,sanatorium,sanitarium,sick bay,surgery,ward"
             },
             "amenity/kindergarten": {
-                "name": "Kindergarten Grounds",
-                "terms": "nursery,preschool"
+                "name": "Preschool/Kindergarten Grounds",
+                "terms": "kindergarten,kindergarden,preschool"
             },
             "amenity/library": {
                 "name": "Library",
@@ -1403,7 +1403,7 @@
             },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
-                "terms": ""
+                "terms": "drug,medicine"
             },
             "amenity/place_of_worship": {
                 "name": "Place of Worship",
@@ -1455,7 +1455,7 @@
             },
             "amenity/school": {
                 "name": "School Grounds",
-                "terms": "academy,alma mater,blackboard,college,department,discipline,establishment,faculty,hall,halls of ivy,institute,institution,jail*,schoolhouse,seminary,university"
+                "terms": "academy,school*"
             },
             "amenity/shelter": {
                 "name": "Shelter",
@@ -1470,7 +1470,7 @@
                 "terms": ""
             },
             "amenity/social_facility/group_home": {
-                "name": "Group Home",
+                "name": "Elderly Group Home",
                 "terms": "elderly,old,senior living"
             },
             "amenity/social_facility/homeless_shelter": {
@@ -1506,8 +1506,8 @@
                 "terms": "village hall,city government,courthouse,municipal building,municipal center,municipal centre"
             },
             "amenity/university": {
-                "name": "University",
-                "terms": "college"
+                "name": "University Grounds",
+                "terms": "college,university"
             },
             "amenity/vending_machine": {
                 "name": "Vending Machine",
@@ -1629,6 +1629,10 @@
                 "name": "Church",
                 "terms": ""
             },
+            "building/college": {
+                "name": "College Building",
+                "terms": "college,university"
+            },
             "building/commercial": {
                 "name": "Commercial Building",
                 "terms": ""
@@ -1681,6 +1685,10 @@
                 "name": "Industrial Building",
                 "terms": ""
             },
+            "building/kindergarten": {
+                "name": "Preschool/Kindergarten Building",
+                "terms": "kindergarten,kindergarden,preschool"
+            },
             "building/public": {
                 "name": "Public Building",
                 "terms": ""
@@ -1699,7 +1707,7 @@
             },
             "building/school": {
                 "name": "School Building",
-                "terms": ""
+                "terms": "academy,school*"
             },
             "building/shed": {
                 "name": "Shed",
@@ -1723,7 +1731,7 @@
             },
             "building/university": {
                 "name": "University Building",
-                "terms": ""
+                "terms": "college,university"
             },
             "building/warehouse": {
                 "name": "Warehouse",
@@ -1731,11 +1739,11 @@
             },
             "craft/basket_maker": {
                 "name": "Basket Maker",
-                "terms": "basket,basketry,basket maker,basket weaver"
+                "terms": "basket*"
             },
             "craft/beekeeper": {
                 "name": "Beekeeper",
-                "terms": "bees,beekeeper,bee box"
+                "terms": "bee*"
             },
             "craft/blacksmith": {
                 "name": "Blacksmith",
@@ -1763,11 +1771,11 @@
             },
             "craft/caterer": {
                 "name": "Caterer",
-                "terms": "Caterer,Catering"
+                "terms": "cater*"
             },
             "craft/clockmaker": {
                 "name": "Clockmaker",
-                "terms": "clock,clockmaker,clock repair"
+                "terms": "clock*"
             },
             "craft/confectionary": {
                 "name": "Confectionary",
@@ -1795,11 +1803,11 @@
             },
             "craft/hvac": {
                 "name": "HVAC",
-                "terms": "heating,ventilating,air-conditioning,air conditioning"
+                "terms": "heat*,vent*,air-conditioning,air conditioning"
             },
             "craft/insulator": {
                 "name": "Insulator",
-                "terms": "insulation,insulator"
+                "terms": "insulat*"
             },
             "craft/jeweler": {
                 "name": "Jeweler",
@@ -1807,11 +1815,11 @@
             },
             "craft/key_cutter": {
                 "name": "Key Cutter",
-                "terms": "key,key cutter"
+                "terms": "key*"
             },
             "craft/locksmith": {
                 "name": "Locksmith",
-                "terms": "locksmith,lock"
+                "terms": "lock*"
             },
             "craft/metal_construction": {
                 "name": "Metal Construction",
@@ -1831,7 +1839,7 @@
             },
             "craft/photographic_laboratory": {
                 "name": "Photographic Laboratory",
-                "terms": "photographic laboratory,film developer"
+                "terms": "photo*,film"
             },
             "craft/plasterer": {
                 "name": "Plasterer",
@@ -1843,7 +1851,7 @@
             },
             "craft/pottery": {
                 "name": "Pottery",
-                "terms": "pottery,potter"
+                "terms": "potter*,ceramic*"
             },
             "craft/rigger": {
                 "name": "Rigger",
@@ -1855,11 +1863,11 @@
             },
             "craft/saddler": {
                 "name": "Saddler",
-                "terms": "saddler"
+                "terms": "saddle*"
             },
             "craft/sailmaker": {
                 "name": "Sailmaker",
-                "terms": "sailmaker"
+                "terms": "sail*"
             },
             "craft/sawmill": {
                 "name": "Sawmill",
@@ -1883,7 +1891,7 @@
             },
             "craft/sweep": {
                 "name": "Chimney Sweep",
-                "terms": "sweep,chimney sweep"
+                "terms": "sweep,chimney"
             },
             "craft/tailor": {
                 "name": "Tailor",
@@ -1903,11 +1911,11 @@
             },
             "craft/watchmaker": {
                 "name": "Watchmaker",
-                "terms": "watch,watchmaker,watch repair"
+                "terms": "watch*"
             },
             "craft/window_construction": {
                 "name": "Window Construction",
-                "terms": "window,window maker,window construction"
+                "terms": "window*"
             },
             "embankment": {
                 "name": "Embankment",
@@ -2407,14 +2415,14 @@
             },
             "man_made/wastewater_plant": {
                 "name": "Wastewater Plant",
-                "terms": "sewage works,sewage treatment plant,water treatment plant,reclamation plant"
+                "terms": "sewage*,water treatment plant,reclamation plant"
             },
             "man_made/water_tower": {
                 "name": "Water Tower",
                 "terms": ""
             },
             "man_made/water_well": {
-                "name": "Water well",
+                "name": "Water Well",
                 "terms": ""
             },
             "man_made/water_works": {
@@ -2543,7 +2551,7 @@
             },
             "office/employment_agency": {
                 "name": "Employment Agency",
-                "terms": ""
+                "terms": "job"
             },
             "office/estate_agent": {
                 "name": "Real Estate Office",
@@ -2763,7 +2771,7 @@
             },
             "shop/art": {
                 "name": "Art Shop",
-                "terms": "art store,art gallery"
+                "terms": "art*"
             },
             "shop/bakery": {
                 "name": "Bakery",
@@ -2907,7 +2915,7 @@
             },
             "shop/locksmith": {
                 "name": "Locksmith",
-                "terms": "keys"
+                "terms": "key*,lock*"
             },
             "shop/lottery": {
                 "name": "Lottery Shop",