]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD.js
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #14 from tomhughes/routing
[rails.git] / vendor / assets / iD / iD.js
diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index 3a53d31b401b2a6dbaab9cde49d85001c362df2a..c7bb962195dce765dd685e4dafbef7c4c5dbac1e 100644 (file)
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -5937,7 +5937,8 @@ d3.xml = d3_xhrType(function(request) {
 d3.combobox = function() {
     var event = d3.dispatch('accept'),
         data = [],
 d3.combobox = function() {
     var event = d3.dispatch('accept'),
         data = [],
-        suggestions = [];
+        suggestions = [],
+        minItems = 2;
 
     var fetcher = function(val, cb) {
         cb(data.filter(function(d) {
 
     var fetcher = function(val, cb) {
         cb(data.filter(function(d) {
@@ -6035,6 +6036,8 @@ d3.combobox = function() {
                    input.on('input.typeahead', function() {
                        idx = -1;
                        render();
                    input.on('input.typeahead', function() {
                        idx = -1;
                        render();
+                       var start = input.property('selectionStart');
+                       input.node().setSelectionRange(start, start);
                        input.on('input.typeahead', change);
                    });
                    break;
                        input.on('input.typeahead', change);
                    });
                    break;
@@ -6126,7 +6129,7 @@ d3.combobox = function() {
         }
 
         function render() {
         }
 
         function render() {
-            if (suggestions.length > 1 && document.activeElement === input.node()) {
+            if (suggestions.length >= minItems && document.activeElement === input.node()) {
                 show();
             } else {
                 hide();
                 show();
             } else {
                 hide();
@@ -6192,6 +6195,12 @@ d3.combobox = function() {
         return combobox;
     };
 
         return combobox;
     };
 
+    combobox.minItems = function(_) {
+        if (!arguments.length) return minItems;
+        minItems = _;
+        return combobox;
+    };
+
     return d3.rebind(combobox, event, 'on');
 };
 d3.geo.tile = function() {
     return d3.rebind(combobox, event, 'on');
 };
 d3.geo.tile = function() {
@@ -15837,7 +15846,7 @@ window.iD = function () {
     var context = {},
         storage;
 
     var context = {},
         storage;
 
-    // https://github.com/systemed/iD/issues/772
+    // https://github.com/openstreetmap/iD/issues/772
     // http://mathiasbynens.be/notes/localstorage-pattern#comment-9
     try { storage = localStorage; } catch (e) {}
     storage = storage || (function() {
     // http://mathiasbynens.be/notes/localstorage-pattern#comment-9
     try { storage = localStorage; } catch (e) {}
     storage = storage || (function() {
@@ -16142,7 +16151,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.3.4';
+iD.version = '1.3.7';
 
 (function() {
     var detected = {};
 
 (function() {
     var detected = {};
@@ -16178,7 +16187,7 @@ iD.version = '1.3.4';
 })();
 iD.taginfo = function() {
     var taginfo = {},
 })();
 iD.taginfo = function() {
     var taginfo = {},
-        endpoint = 'http://taginfo.openstreetmap.org/api/4/',
+        endpoint = 'https://taginfo.openstreetmap.org/api/4/',
         tag_sorts = {
             point: 'count_nodes',
             vertex: 'count_nodes',
         tag_sorts = {
             point: 'count_nodes',
             vertex: 'count_nodes',
@@ -16314,7 +16323,7 @@ iD.taginfo = function() {
 };
 iD.wikipedia  = function() {
     var wiki = {},
 };
 iD.wikipedia  = function() {
     var wiki = {},
-        endpoint = 'http://en.wikipedia.org/w/api.php?';
+        endpoint = 'https://en.wikipedia.org/w/api.php?';
 
     wiki.search = function(lang, query, callback) {
         lang = lang || 'en';
 
     wiki.search = function(lang, query, callback) {
         lang = lang || 'en';
@@ -16457,6 +16466,15 @@ iD.util.prefixCSSProperty = function(property) {
     return false;
 };
 
     return false;
 };
 
+
+iD.util.setTransform = function(el, x, y, scale) {
+    var prop = iD.util.transformProperty = iD.util.transformProperty || iD.util.prefixCSSProperty('Transform'),
+        translate = iD.detect().opera ?
+            'translate('   + x + 'px,' + y + 'px)' :
+            'translate3d(' + x + 'px,' + y + 'px,0)';
+    return el.style(prop, translate + (scale ? ' scale(' + scale + ')' : ''));
+};
+
 iD.util.getStyle = function(selector) {
     for (var i = 0; i < document.styleSheets.length; i++) {
         var rules = document.styleSheets[i].rules || document.styleSheets[i].cssRules || [];
 iD.util.getStyle = function(selector) {
     for (var i = 0; i < document.styleSheets.length; i++) {
         var rules = document.styleSheets[i].rules || document.styleSheets[i].cssRules || [];
@@ -16783,7 +16801,7 @@ _.extend(iD.geo.Extent.prototype, {
     }
 });
 // For fixing up rendering of multipolygons with tags on the outer member.
     }
 });
 // For fixing up rendering of multipolygons with tags on the outer member.
-// https://github.com/systemed/iD/issues/613
+// https://github.com/openstreetmap/iD/issues/613
 iD.geo.isSimpleMultipolygonOuterMember = function(entity, graph) {
     if (entity.type !== 'way')
         return false;
 iD.geo.isSimpleMultipolygonOuterMember = function(entity, graph) {
     if (entity.type !== 'way')
         return false;
@@ -17402,8 +17420,13 @@ iD.actions.DiscardTags = function(difference) {
     return function(graph) {
         function discardTags(entity) {
             if (!_.isEmpty(entity.tags)) {
     return function(graph) {
         function discardTags(entity) {
             if (!_.isEmpty(entity.tags)) {
+                var tags = {};
+                _.each(entity.tags, function(v, k) {
+                    if (v) tags[k] = v;
+                });
+
                 graph = graph.replace(entity.update({
                 graph = graph.replace(entity.update({
-                    tags: _.omit(entity.tags, iD.data.discarded)
+                    tags: _.omit(tags, iD.data.discarded)
                 }));
             }
         }
                 }));
             }
         }
@@ -17679,10 +17702,14 @@ iD.actions.MergePolygon = function(ids, newRelationId) {
             graph = graph.remove(m);
         });
 
             graph = graph.remove(m);
         });
 
-        members.forEach(function(m) {
-            var entity = graph.entity(m.id);
-            relation = relation.mergeTags(entity.tags);
-            graph = graph.replace(entity.update({ tags: {} }));
+        entities.closedWay.forEach(function(way) {
+            function isThisOuter(m) {
+                return m.id === way.id && m.role !== 'inner';
+            }
+            if (members.some(isThisOuter)) {
+                relation = relation.mergeTags(way.tags);
+                graph = graph.replace(way.update({ tags: {} }));
+            }
         });
 
         return graph.replace(relation.update({
         });
 
         return graph.replace(relation.update({
@@ -17696,6 +17723,8 @@ iD.actions.MergePolygon = function(ids, newRelationId) {
         if (entities.other.length > 0 ||
             entities.closedWay.length + entities.multipolygon.length < 2)
             return 'not_eligible';
         if (entities.other.length > 0 ||
             entities.closedWay.length + entities.multipolygon.length < 2)
             return 'not_eligible';
+        if (!entities.multipolygon.every(function(r) { return r.isComplete(graph); }))
+            return 'incomplete_relation';
     };
 
     return action;
     };
 
     return action;
@@ -17760,7 +17789,7 @@ iD.actions.Noop = function() {
  */
 
 iD.actions.Orthogonalize = function(wayId, projection) {
  */
 
 iD.actions.Orthogonalize = function(wayId, projection) {
-    var threshold = 7, // degrees within right or straight to alter
+    var threshold = 12, // degrees within right or straight to alter
         lowerThreshold = Math.cos((90 - threshold) * Math.PI / 180),
         upperThreshold = Math.cos(threshold * Math.PI / 180);
 
         lowerThreshold = Math.cos((90 - threshold) * Math.PI / 180),
         upperThreshold = Math.cos(threshold * Math.PI / 180);
 
@@ -18692,7 +18721,7 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
         start = iD.Node({loc: context.graph().entity(way.nodes[startIndex]).loc}),
         end = iD.Node({loc: context.map().mouseCoordinates()}),
         segment = iD.Way({
         start = iD.Node({loc: context.graph().entity(way.nodes[startIndex]).loc}),
         end = iD.Node({loc: context.map().mouseCoordinates()}),
         segment = iD.Way({
-            nodes: [start.id, end.id],
+            nodes: typeof index === 'undefined' ? [start.id, end.id] : [end.id, start.id],
             tags: _.clone(way.tags)
         });
 
             tags: _.clone(way.tags)
         });
 
@@ -19224,8 +19253,7 @@ iD.behavior.Tail = function() {
         container,
         xmargin = 25,
         tooltipSize = [0, 0],
         container,
         xmargin = 25,
         tooltipSize = [0, 0],
-        selectionSize = [0, 0],
-        transformProp = iD.util.prefixCSSProperty('Transform');
+        selectionSize = [0, 0];
 
     function tail(selection) {
         if (!text) return;
 
     function tail(selection) {
         if (!text) return;
@@ -19243,18 +19271,16 @@ iD.behavior.Tail = function() {
             var xoffset = ((d3.event.clientX + tooltipSize[0] + xmargin) > selectionSize[0]) ?
                 -tooltipSize[0] - xmargin : xmargin;
             container.classed('left', xoffset > 0);
             var xoffset = ((d3.event.clientX + tooltipSize[0] + xmargin) > selectionSize[0]) ?
                 -tooltipSize[0] - xmargin : xmargin;
             container.classed('left', xoffset > 0);
-            container.style(transformProp, 'translate(' +
-                (~~d3.event.clientX + xoffset) + 'px,' +
-                ~~d3.event.clientY + 'px)');
+            iD.util.setTransform(container, d3.event.clientX + xoffset, d3.event.clientY);
         }
 
         }
 
-        function mouseout() {
+        function mouseleave() {
             if (d3.event.relatedTarget !== container.node()) {
                 container.style('display', 'none');
             }
         }
 
             if (d3.event.relatedTarget !== container.node()) {
                 container.style('display', 'none');
             }
         }
 
-        function mouseover() {
+        function mouseenter() {
             if (d3.event.relatedTarget !== container.node()) {
                 show();
             }
             if (d3.event.relatedTarget !== container.node()) {
                 show();
             }
@@ -19270,8 +19296,8 @@ iD.behavior.Tail = function() {
 
         selection
             .on('mousemove.tail', mousemove)
 
         selection
             .on('mousemove.tail', mousemove)
-            .on('mouseover.tail', mouseover)
-            .on('mouseout.tail', mouseout);
+            .on('mouseenter.tail', mouseenter)
+            .on('mouseleave.tail', mouseleave);
 
         container
             .on('mousemove.tail', mousemove);
 
         container
             .on('mousemove.tail', mousemove);
@@ -19289,8 +19315,8 @@ iD.behavior.Tail = function() {
 
         selection
             .on('mousemove.tail', null)
 
         selection
             .on('mousemove.tail', null)
-            .on('mouseover.tail', null)
-            .on('mouseout.tail', null);
+            .on('mouseenter.tail', null)
+            .on('mouseleave.tail', null);
 
         d3.select(window)
             .on('resize.tail', null);
 
         d3.select(window)
             .on('resize.tail', null);
@@ -20547,6 +20573,9 @@ iD.operations.Merge = function(selectedIDs, context) {
         if (j === 'restriction' && m && p)
             return t('operations.merge.restriction', {relation: context.presets().item('type/restriction').name()});
 
         if (j === 'restriction' && m && p)
             return t('operations.merge.restriction', {relation: context.presets().item('type/restriction').name()});
 
+        if (p === 'incomplete_relation' && j && m)
+            return t('operations.merge.incomplete_relation');
+
         if (j && m && p)
             return t('operations.merge.' + j);
 
         if (j && m && p)
             return t('operations.merge.' + j);
 
@@ -20658,9 +20687,18 @@ iD.operations.Rotate = function(selectedIDs, context) {
     };
 
     operation.available = function() {
     };
 
     operation.available = function() {
-        return selectedIDs.length === 1 &&
-            context.entity(entityId).type === 'way' &&
-            context.geometry(entityId) === 'area';
+        var graph = context.graph(),
+            entity = graph.entity(entityId);
+
+        if (selectedIDs.length !== 1 ||
+            entity.type !== 'way')
+            return false;
+        if (context.geometry(entityId) === 'area')
+            return true;
+        if (entity.isClosed() &&
+            graph.parentRelations(entity).some(function(r) { return r.isMultipolygon(); }))
+            return true;
+        return false;
     };
 
     operation.disabled = function() {
     };
 
     operation.disabled = function() {
@@ -20774,6 +20812,7 @@ iD.areaKeys = {
     "amenity": {
         "atm": true,
         "bench": true,
     "amenity": {
         "atm": true,
         "bench": true,
+        "clock": true,
         "drinking_water": true,
         "post_box": true,
         "telephone": true,
         "drinking_water": true,
         "post_box": true,
         "telephone": true,
@@ -20796,6 +20835,7 @@ iD.areaKeys = {
     "building": {
         "entrance": true
     },
     "building": {
         "entrance": true
     },
+    "craft": {},
     "emergency": {
         "fire_hydrant": true,
         "phone": true
     "emergency": {
         "fire_hydrant": true,
         "phone": true
@@ -20825,6 +20865,7 @@ iD.areaKeys = {
         "tree": true
     },
     "office": {},
         "tree": true
     },
     "office": {},
+    "piste:type": {},
     "place": {},
     "power": {
         "line": true,
     "place": {},
     "power": {
         "line": true,
@@ -20871,15 +20912,19 @@ iD.areaKeys = {
         off;
 
     connection.changesetURL = function(changesetId) {
         off;
 
     connection.changesetURL = function(changesetId) {
-        return url + '/browse/changeset/' + changesetId;
+        return url + '/changeset/' + changesetId;
     };
 
     };
 
-    connection.changesetsURL = function(extent) {
-        return url + '/browse/changesets?bbox=' + extent.toParam();
+    connection.changesetsURL = function(center, zoom) {
+        var precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
+        return url + '/history#map=' +
+            Math.floor(zoom) + '/' +
+            center[1].toFixed(precision) + '/' +
+            center[0].toFixed(precision);
     };
 
     connection.entityURL = function(entity) {
     };
 
     connection.entityURL = function(entity) {
-        return url + '/browse/' + entity.type + '/' + entity.osmId();
+        return url + '/' + entity.type + '/' + entity.osmId();
     };
 
     connection.userURL = function(username) {
     };
 
     connection.userURL = function(username) {
@@ -21559,13 +21604,12 @@ iD.Graph = function(other, mutable) {
         this.entities = _.assign(Object.create(base.entities), other.entities);
         this._parentWays = _.assign(Object.create(base.parentWays), other._parentWays);
         this._parentRels = _.assign(Object.create(base.parentRels), other._parentRels);
         this.entities = _.assign(Object.create(base.entities), other.entities);
         this._parentWays = _.assign(Object.create(base.parentWays), other._parentWays);
         this._parentRels = _.assign(Object.create(base.parentRels), other._parentRels);
-        this.inherited = true;
 
     } else {
         this.entities = Object.create({});
         this._parentWays = Object.create({});
         this._parentRels = Object.create({});
 
     } else {
         this.entities = Object.create({});
         this._parentWays = Object.create({});
         this._parentRels = Object.create({});
-        this.rebase(other || []);
+        this.rebase(other || [], [this]);
     }
 
     this.transients = {};
     }
 
     this.transients = {};
@@ -21648,22 +21692,44 @@ iD.Graph.prototype = {
     // is used only during the history operation that merges newly downloaded
     // data into each state. To external consumers, it should appear as if the
     // graph always contained the newly downloaded data.
     // is used only during the history operation that merges newly downloaded
     // data into each state. To external consumers, it should appear as if the
     // graph always contained the newly downloaded data.
-    rebase: function(entities) {
+    rebase: function(entities, stack) {
         var base = this.base(),
         var base = this.base(),
-            i, k, child, id, keys;
+            i, j, k, id;
 
 
-        // Merging of data only needed if graph is the base graph
-        if (!this.inherited) {
-            for (i = 0; i < entities.length; i++) {
-                var entity = entities[i];
-                if (!base.entities[entity.id]) {
-                    base.entities[entity.id] = entity;
-                    this._updateCalculated(undefined, entity,
-                        base.parentWays, base.parentRels);
+        for (i = 0; i < entities.length; i++) {
+            var entity = entities[i];
+
+            if (base.entities[entity.id])
+                continue;
+
+            // Merging data into the base graph
+            base.entities[entity.id] = entity;
+            this._updateCalculated(undefined, entity,
+                base.parentWays, base.parentRels);
+
+            // Restore provisionally-deleted nodes that are discovered to have an extant parent
+            if (entity.type === 'way') {
+                for (j = 0; j < entity.nodes.length; j++) {
+                    id = entity.nodes[j];
+                    for (k = 1; k < stack.length; k++) {
+                        var ents = stack[k].entities;
+                        if (ents.hasOwnProperty(id) && ents[id] === undefined) {
+                            delete ents[id];
+                        }
+                    }
                 }
             }
         }
 
                 }
             }
         }
 
+        for (i = 0; i < stack.length; i++) {
+            stack[i]._updateRebased();
+        }
+    },
+
+    _updateRebased: function() {
+        var base = this.base(),
+            i, k, child, id, keys;
+
         keys = Object.keys(this._parentWays);
         for (i = 0; i < keys.length; i++) {
             child = keys[i];
         keys = Object.keys(this._parentWays);
         for (i = 0; i < keys.length; i++) {
             child = keys[i];
@@ -21782,9 +21848,7 @@ iD.Graph.prototype = {
     freeze: function() {
         this.frozen = true;
 
     freeze: function() {
         this.frozen = true;
 
-        if (iD.debug) {
-            Object.freeze(this.entities);
-        }
+        // No longer freezing entities here due to in-place updates needed in rebase.
 
         return this;
     },
 
         return this;
     },
@@ -21846,10 +21910,7 @@ iD.History = function(context) {
         },
 
         merge: function(entities, extent) {
         },
 
         merge: function(entities, extent) {
-            for (var i = 0; i < stack.length; i++) {
-                stack[i].graph.rebase(entities);
-            }
-
+            stack[0].graph.rebase(entities, _.pluck(stack, 'graph'));
             tree.rebase(entities);
 
             dispatch.change(undefined, extent);
             tree.rebase(entities);
 
             dispatch.change(undefined, extent);
@@ -21981,7 +22042,9 @@ iD.History = function(context) {
         toJSON: function() {
             if (stack.length <= 1) return;
 
         toJSON: function() {
             if (stack.length <= 1) return;
 
-            var allEntities = {};
+            var allEntities = {},
+                baseEntities = {},
+                base = stack[0];
 
             var s = stack.map(function(i) {
                 var modified = [], deleted = [];
 
             var s = stack.map(function(i) {
                 var modified = [], deleted = [];
@@ -21994,6 +22057,12 @@ iD.History = function(context) {
                     } else {
                         deleted.push(id);
                     }
                     } else {
                         deleted.push(id);
                     }
+
+                    // make sure that the originals of changed or deleted entities get merged
+                    // into the base of the stack after restoring the data from JSON.
+                    if (id in base.graph.entities) {
+                        baseEntities[id] = base.graph.entities[id];
+                    }
                 });
 
                 var x = {};
                 });
 
                 var x = {};
@@ -22007,8 +22076,9 @@ iD.History = function(context) {
             });
 
             return JSON.stringify({
             });
 
             return JSON.stringify({
-                version: 2,
+                version: 3,
                 entities: _.values(allEntities),
                 entities: _.values(allEntities),
+                baseEntities: _.values(baseEntities),
                 stack: s,
                 nextIDs: iD.Entity.id.next,
                 index: index
                 stack: s,
                 nextIDs: iD.Entity.id.next,
                 index: index
@@ -22021,13 +22091,22 @@ iD.History = function(context) {
             iD.Entity.id.next = h.nextIDs;
             index = h.index;
 
             iD.Entity.id.next = h.nextIDs;
             index = h.index;
 
-            if (h.version === 2) {
+            if (h.version === 2 || h.version === 3) {
                 var allEntities = {};
 
                 h.entities.forEach(function(entity) {
                     allEntities[iD.Entity.key(entity)] = iD.Entity(entity);
                 });
 
                 var allEntities = {};
 
                 h.entities.forEach(function(entity) {
                     allEntities[iD.Entity.key(entity)] = iD.Entity(entity);
                 });
 
+                if (h.version === 3) {
+                    // this merges originals for changed entities into the base of
+                    // the stack even if the current stack doesn't have them (for
+                    // example when iD has been restarted in a different region)
+                    var baseEntities = h.baseEntities.map(iD.Entity);
+                    stack[0].graph.rebase(baseEntities, _.pluck(stack, 'graph'));
+                    tree.rebase(baseEntities);
+                }
+
                 stack = h.stack.map(function(d) {
                     var entities = {}, entity;
 
                 stack = h.stack.map(function(d) {
                     var entities = {}, entity;
 
@@ -22064,7 +22143,6 @@ iD.History = function(context) {
                 });
             }
 
                 });
             }
 
-            stack[0].graph.inherited = false;
             dispatch.change();
 
             return history;
             dispatch.change();
 
             return history;
@@ -22100,8 +22178,6 @@ iD.History = function(context) {
 
             var json = context.storage(getKey('saved_history'));
             if (json) history.fromJSON(json);
 
             var json = context.storage(getKey('saved_history'));
             if (json) history.fromJSON(json);
-
-            context.storage(getKey('saved_history', null));
         },
 
         _getKey: getKey
         },
 
         _getKey: getKey
@@ -22184,16 +22260,27 @@ iD.Relation = iD.Entity.relation = function iD_Relation() {
 
 iD.Relation.prototype = Object.create(iD.Entity.prototype);
 
 
 iD.Relation.prototype = Object.create(iD.Entity.prototype);
 
+iD.Relation.creationOrder = function(a, b) {
+    var aId = parseInt(iD.Entity.id.toOSM(a.id), 10);
+    var bId = parseInt(iD.Entity.id.toOSM(b.id), 10);
+
+    if (aId < 0 || bId < 0) return aId - bId;
+    return bId - aId;
+};
+
 _.extend(iD.Relation.prototype, {
     type: 'relation',
     members: [],
 
 _.extend(iD.Relation.prototype, {
     type: 'relation',
     members: [],
 
-    extent: function(resolver) {
+    extent: function(resolver, memo) {
         return resolver.transient(this, 'extent', function() {
         return resolver.transient(this, 'extent', function() {
+            if (memo && memo[this.id]) return iD.geo.Extent();
+            memo = memo || {};
+            memo[this.id] = true;
             return this.members.reduce(function(extent, member) {
                 member = resolver.hasEntity(member.id);
                 if (member) {
             return this.members.reduce(function(extent, member) {
                 member = resolver.hasEntity(member.id);
                 if (member) {
-                    return extent.extend(member.extent(resolver));
+                    return extent.extend(member.extent(resolver, memo));
                 } else {
                     return extent;
                 }
                 } else {
                     return extent;
                 }
@@ -22434,7 +22521,11 @@ iD.Tree = function(head) {
         return rect;
     }
 
         return rect;
     }
 
-    function updateParents(entity, insertions) {
+    function updateParents(entity, insertions, memo) {
+        if (memo && memo[entity.id]) return;
+        memo = memo || {};
+        memo[entity.id] = true;
+
         head.parentWays(entity).forEach(function(parent) {
             if (rectangles[parent.id]) {
                 rtree.remove(rectangles[parent.id]);
         head.parentWays(entity).forEach(function(parent) {
             if (rectangles[parent.id]) {
                 rtree.remove(rectangles[parent.id]);
@@ -22447,7 +22538,7 @@ iD.Tree = function(head) {
                 rtree.remove(rectangles[parent.id]);
                 insertions.push(parent);
             }
                 rtree.remove(rectangles[parent.id]);
                 insertions.push(parent);
             }
-            updateParents(parent, insertions);
+            updateParents(parent, insertions, memo);
         });
     }
 
         });
     }
 
@@ -23000,7 +23091,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) {
 
     var bing = iD.BackgroundSource(data),
         key = 'Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU', // Same as P2 and JOSM
 
     var bing = iD.BackgroundSource(data),
         key = 'Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU', // Same as P2 and JOSM
-        url = 'http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' +
+        url = 'https://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' +
             key + '&jsonp={callback}',
         providers = [];
 
             key + '&jsonp={callback}',
         providers = [];
 
@@ -23019,7 +23110,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) {
         dispatch.change();
     });
 
         dispatch.change();
     });
 
-    var template = 'http://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z',
+    var template = 'https://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z',
         subdomains = [0, 1, 2, 3];
 
     bing.url = function(coord) {
         subdomains = [0, 1, 2, 3];
 
     bing.url = function(coord) {
@@ -23199,7 +23290,6 @@ iD.Map = function(context) {
         transformStart,
         transformed = false,
         minzoom = 0,
         transformStart,
         transformed = false,
         minzoom = 0,
-        transformProp = iD.util.prefixCSSProperty('Transform'),
         points = iD.svg.Points(roundedProjection, context),
         vertices = iD.svg.Vertices(roundedProjection, context),
         lines = iD.svg.Lines(projection),
         points = iD.svg.Points(roundedProjection, context),
         vertices = iD.svg.Vertices(roundedProjection, context),
         lines = iD.svg.Lines(projection),
@@ -23366,13 +23456,8 @@ iD.Map = function(context) {
             tX = Math.round((d3.event.translate[0] / scale - transformStart[1][0]) * scale),
             tY = Math.round((d3.event.translate[1] / scale - transformStart[1][1]) * scale);
 
             tX = Math.round((d3.event.translate[0] / scale - transformStart[1][0]) * scale),
             tY = Math.round((d3.event.translate[1] / scale - transformStart[1][1]) * scale);
 
-        var transform =
-            (iD.detect().opera ?
-                'translate(' + tX + 'px,' + tY + 'px)' :
-                'translate3d(' + tX + 'px,' + tY + 'px, 0)') + ' scale(' + scale + ')';
-
         transformed = true;
         transformed = true;
-        supersurface.style(transformProp, transform);
+        iD.util.setTransform(supersurface, tX, tY, scale);
         queueRedraw();
 
         dispatch.move(map);
         queueRedraw();
 
         dispatch.move(map);
@@ -23380,7 +23465,7 @@ iD.Map = function(context) {
 
     function resetTransform() {
         if (!transformed) return false;
 
     function resetTransform() {
         if (!transformed) return false;
-        supersurface.style(transformProp, iD.detect().opera ? '' : 'translate3d(0,0,0)');
+        iD.util.setTransform(supersurface, 0, 0);
         transformed = false;
         return true;
     }
         transformed = false;
         return true;
     }
@@ -23953,7 +24038,7 @@ iD.svg.Areas = function(projection) {
             .data(function(layer) { return data[layer]; }, iD.Entity.key);
 
         // Remove exiting areas first, so they aren't included in the `fills`
             .data(function(layer) { return data[layer]; }, iD.Entity.key);
 
         // Remove exiting areas first, so they aren't included in the `fills`
-        // array used for sorting below (https://github.com/systemed/iD/issues/1903).
+        // array used for sorting below (https://github.com/openstreetmap/iD/issues/1903).
         paths.exit()
             .remove();
 
         paths.exit()
             .remove();
 
@@ -24552,8 +24637,12 @@ iD.svg.Midpoints = function(projection, context) {
                     b = nodes[j + 1],
                     id = [a.id, b.id].sort().join('-');
 
                     b = nodes[j + 1],
                     id = [a.id, b.id].sort().join('-');
 
-                // If neither of the nodes changed, no need to redraw midpoint
-                if (!midpoints[id] && (filter(a) || filter(b))) {
+                // Redraw midpoints in two cases:
+                //   1. One of the two endpoint nodes changed (e.g. was moved).
+                //   2. A node was deleted. The midpoint between the two new
+                //      endpoints needs to be redrawn. In this case only the
+                //      way will be in the diff.
+                if (!midpoints[id] && (filter(a) || filter(b) || filter(entity))) {
                     var loc = iD.geo.interp(a.loc, b.loc, 0.5);
                     if (extent.intersects(loc) && iD.geo.euclideanDistance(projection(a.loc), projection(b.loc)) > 40) {
                         midpoints[id] = {
                     var loc = iD.geo.interp(a.loc, b.loc, 0.5);
                     if (extent.intersects(loc) && iD.geo.euclideanDistance(projection(a.loc), projection(b.loc)) > 40) {
                         midpoints[id] = {
@@ -25159,14 +25248,14 @@ iD.ui = function(context) {
             .append('a')
             .attr('target', '_blank')
             .attr('tabindex', -1)
             .append('a')
             .attr('target', '_blank')
             .attr('tabindex', -1)
-            .attr('href', 'http://github.com/systemed/iD')
+            .attr('href', 'http://github.com/openstreetmap/iD')
             .text(iD.version);
 
         var bugReport = linkList.append('li')
             .append('a')
             .attr('target', '_blank')
             .attr('tabindex', -1)
             .text(iD.version);
 
         var bugReport = linkList.append('li')
             .append('a')
             .attr('target', '_blank')
             .attr('tabindex', -1)
-            .attr('href', 'https://github.com/systemed/iD/issues');
+            .attr('href', 'https://github.com/openstreetmap/iD/issues');
 
         bugReport.append('span')
             .attr('class','icon bug light');
 
         bugReport.append('span')
             .attr('class','icon bug light');
@@ -25396,11 +25485,15 @@ iD.ui.Background = function(context) {
     function background(selection) {
 
         function setOpacity(d) {
     function background(selection) {
 
         function setOpacity(d) {
-            context.container().selectAll('.background-layer')
+            var bg = context.container().selectAll('.background-layer')
                 .transition()
                 .style('opacity', d)
                 .attr('data-opacity', d);
 
                 .transition()
                 .style('opacity', d)
                 .attr('data-opacity', d);
 
+            if (!iD.detect().opera) {
+                iD.util.setTransform(bg, 0, 0);
+            }
+
             opacityList.selectAll('li')
                 .classed('active', function(_) { return _ === d; });
 
             opacityList.selectAll('li')
                 .classed('active', function(_) { return _ === d; });
 
@@ -25940,7 +26033,9 @@ iD.ui.Commit = function(context) {
         function warningClick(d) {
             if (d.entity) {
                 context.map().zoomTo(d.entity);
         function warningClick(d) {
             if (d.entity) {
                 context.map().zoomTo(d.entity);
-                context.enter(iD.modes.Select(context, [d.entity.id]));
+                context.enter(
+                    iD.modes.Select(context, [d.entity.id])
+                        .suppressMenu(true));
             }
         }
     }
             }
         }
     }
@@ -26009,7 +26104,7 @@ iD.ui.Contributors = function(context) {
                 .attr('target', '_blank')
                 .attr('tabindex', -1)
                 .attr('href', function() {
                 .attr('target', '_blank')
                 .attr('tabindex', -1)
                 .attr('href', function() {
-                    return context.connection().changesetsURL(context.map().extent());
+                    return context.connection().changesetsURL(context.map().center(), context.map().zoom());
                 })
                 .text(u.length - limit + 1);
 
                 })
                 .text(u.length - limit + 1);
 
@@ -26286,7 +26381,7 @@ iD.ui.FeatureList = function(context) {
             var q = search.property('value'),
                 items = list.selectAll('.feature-list-item');
             if (d3.event.keyCode === 13 && q.length && items.size()) {
             var q = search.property('value'),
                 items = list.selectAll('.feature-list-item');
             if (d3.event.keyCode === 13 && q.length && items.size()) {
-                click(items.datum().entity);
+                click(items.datum());
             }
         }
 
             }
         }
 
@@ -26330,6 +26425,29 @@ iD.ui.FeatureList = function(context) {
 
             if (!q) return result;
 
 
             if (!q) return result;
 
+            var idMatch = q.match(/^([nwr])([0-9]+)$/);
+
+            if (idMatch) {
+                result.push({
+                    id: idMatch[0],
+                    geometry: idMatch[1] === 'n' ? 'point' : idMatch[1] === 'w' ? 'line' : 'relation',
+                    type: idMatch[1] === 'n' ? t('inspector.node') : idMatch[1] === 'w' ? t('inspector.way') : t('inspector.relation'),
+                    name: idMatch[2]
+                });
+            }
+
+            var locationMatch = q.match(/^(-?\d+\.?\d*)\s+(-?\d+\.?\d*)$/);
+
+            if (locationMatch) {
+                result.push({
+                    id: -1,
+                    geometry: 'point',
+                    type: t('inspector.location'),
+                    name: locationMatch[0],
+                    location: [parseFloat(locationMatch[1]), parseFloat(locationMatch[2])]
+                });
+            }
+
             function addEntity(entity) {
                 if (entity.id in entities || result.length > 200)
                     return;
             function addEntity(entity) {
                 if (entity.id in entities || result.length > 200)
                     return;
@@ -26358,12 +26476,13 @@ iD.ui.FeatureList = function(context) {
             }
 
             (geocodeResults || []).forEach(function(d) {
             }
 
             (geocodeResults || []).forEach(function(d) {
-                // https://github.com/systemed/iD/issues/1890
+                // https://github.com/openstreetmap/iD/issues/1890
                 if (d.osm_type && d.osm_id) {
                     result.push({
                         id: iD.Entity.id.fromOSM(d.osm_type, d.osm_id),
                         geometry: d.osm_type === 'relation' ? 'relation' : d.osm_type === 'way' ? 'line' : 'point',
                 if (d.osm_type && d.osm_id) {
                     result.push({
                         id: iD.Entity.id.fromOSM(d.osm_type, d.osm_id),
                         geometry: d.osm_type === 'relation' ? 'relation' : d.osm_type === 'way' ? 'line' : 'point',
-                        type: (d.type.charAt(0).toUpperCase() + d.type.slice(1)).replace('_', ' '),
+                        type: d.type !== 'yes' ? (d.type.charAt(0).toUpperCase() + d.type.slice(1)).replace('_', ' ')
+                                               : (d.class.charAt(0).toUpperCase() + d.class.slice(1)).replace('_', ' '),
                         name: d.display_name,
                         extent: new iD.geo.Extent(
                             [parseFloat(d.boundingbox[3]), parseFloat(d.boundingbox[0])],
                         name: d.display_name,
                         extent: new iD.geo.Extent(
                             [parseFloat(d.boundingbox[3]), parseFloat(d.boundingbox[0])],
@@ -26415,6 +26534,10 @@ iD.ui.FeatureList = function(context) {
             list.selectAll('.geocode-item')
                 .style('display', (value && geocodeResults === undefined) ? 'block' : 'none');
 
             list.selectAll('.geocode-item')
                 .style('display', (value && geocodeResults === undefined) ? 'block' : 'none');
 
+            list.selectAll('.feature-list-item')
+                .data([-1])
+                .remove();
+
             var items = list.selectAll('.feature-list-item')
                 .data(results, function(d) { return d.id; });
 
             var items = list.selectAll('.feature-list-item')
                 .data(results, function(d) { return d.id; });
 
@@ -26449,6 +26572,8 @@ iD.ui.FeatureList = function(context) {
         }
 
         function mouseover(d) {
         }
 
         function mouseover(d) {
+            if (d.id === -1) return;
+
             context.surface().selectAll(iD.util.entityOrMemberSelector([d.id], context.graph()))
                 .classed('hover', true);
         }
             context.surface().selectAll(iD.util.entityOrMemberSelector([d.id], context.graph()))
                 .classed('hover', true);
         }
@@ -26460,7 +26585,10 @@ iD.ui.FeatureList = function(context) {
 
         function click(d) {
             d3.event.preventDefault();
 
         function click(d) {
             d3.event.preventDefault();
-            if (d.entity) {
+            if (d.location) {
+                context.map().centerZoom([d.location[1], d.location[0]], 20);
+            }
+            else if (d.entity) {
                 context.enter(iD.modes.Select(context, [d.entity.id]));
             } else {
                 context.loadEntity(d.id);
                 context.enter(iD.modes.Select(context, [d.entity.id]));
             } else {
                 context.loadEntity(d.id);
@@ -26737,10 +26865,8 @@ iD.ui.Inspector = function(context) {
                 .entityID(entityID));
 
         function showList(preset) {
                 .entityID(entityID));
 
         function showList(preset) {
-            var right = $wrap.style('right').indexOf('%') > 0 ? '-100%' : '-' + selection.style('width');
-
             $wrap.transition()
             $wrap.transition()
-                .style('right', right);
+                .styleTween('right', function() { return d3.interpolate('0%', '-100%'); });
 
             $presetPane.call(presetList
                 .preset(preset)
 
             $presetPane.call(presetList
                 .preset(preset)
@@ -26748,10 +26874,8 @@ iD.ui.Inspector = function(context) {
         }
 
         function setPreset(preset) {
         }
 
         function setPreset(preset) {
-            var right = $wrap.style('right').indexOf('%') > 0 ? '0%' : '0px';
-
             $wrap.transition()
             $wrap.transition()
-                .style('right', right);
+                .styleTween('right', function() { return d3.interpolate('-100%', '0%'); });
 
             $editorPane.call(entityEditor
                 .preset(preset));
 
             $editorPane.call(entityEditor
                 .preset(preset));
@@ -27770,7 +27894,7 @@ iD.ui.RadialMenu = function(context, operations) {
             .attr('class', 'tooltip-inner radial-menu-tooltip');
 
         function mousedown() {
             .attr('class', 'tooltip-inner radial-menu-tooltip');
 
         function mousedown() {
-            d3.event.stopPropagation(); // https://github.com/systemed/iD/issues/1869
+            d3.event.stopPropagation(); // https://github.com/openstreetmap/iD/issues/1869
         }
 
         function mouseover(d, i) {
         }
 
         function mouseover(d, i) {
@@ -27811,7 +27935,9 @@ iD.ui.RadialMenu = function(context, operations) {
 
     radialMenu.close = function() {
         if (menu) {
 
     radialMenu.close = function() {
         if (menu) {
-            menu.transition()
+            menu
+                .style('pointer-events', 'none')
+                .transition()
                 .attr('opacity', 0)
                 .remove();
         }
                 .attr('opacity', 0)
                 .remove();
         }
@@ -27986,10 +28112,11 @@ iD.ui.RawMembershipEditor = function(context) {
     }
 
     function relations(q) {
     }
 
     function relations(q) {
-        var result = [{
+        var newRelation = {
                 relation: null,
                 value: t('inspector.new_relation')
                 relation: null,
                 value: t('inspector.new_relation')
-            }],
+            },
+            result = [],
             graph = context.graph();
 
         context.intersects(context.extent()).forEach(function(entity) {
             graph = context.graph();
 
         context.intersects(context.extent()).forEach(function(entity) {
@@ -28009,6 +28136,11 @@ iD.ui.RawMembershipEditor = function(context) {
             });
         });
 
             });
         });
 
+        result.sort(function(a, b) {
+            return iD.Relation.creationOrder(a.relation, b.relation);
+        });
+        result.unshift(newRelation);
+
         return result;
     }
 
         return result;
     }
 
@@ -28092,6 +28224,7 @@ iD.ui.RawMembershipEditor = function(context) {
                     .attr('type', 'text')
                     .attr('class', 'member-entity-input')
                     .call(d3.combobox()
                     .attr('type', 'text')
                     .attr('class', 'member-entity-input')
                     .call(d3.combobox()
+                        .minItems(1)
                         .fetcher(function(value, callback) {
                             callback(relations(value));
                         })
                         .fetcher(function(value, callback) {
                             callback(relations(value));
                         })
@@ -28579,6 +28712,8 @@ iD.ui.Sidebar = function(context) {
             }
         };
 
             }
         };
 
+        sidebar.hover = _.throttle(sidebar.hover, 200);
+
         sidebar.select = function(id, newFeature) {
             if (!current && id) {
                 featureListWrap.classed('inspector-hidden', true);
         sidebar.select = function(id, newFeature) {
             if (!current && id) {
                 featureListWrap.classed('inspector-hidden', true);
@@ -28707,7 +28842,7 @@ iD.ui.Splash = function(context) {
             .html(t('splash.text', {
                 version: iD.version,
                 website: '<a href="http://ideditor.com/">ideditor.com</a>',
             .html(t('splash.text', {
                 version: iD.version,
                 website: '<a href="http://ideditor.com/">ideditor.com</a>',
-                github: '<a href="https://github.com/systemed/iD">github.com</a>'
+                github: '<a href="https://github.com/openstreetmap/iD">github.com</a>'
             }));
 
         var buttons = introModal.append('div').attr('class', 'modal-actions cf');
             }));
 
         var buttons = introModal.append('div').attr('class', 'modal-actions cf');
@@ -29274,7 +29409,6 @@ iD.ui.preset.access = function(field) {
 };
 iD.ui.preset.address = function(field, context) {
     var event = d3.dispatch('change'),
 };
 iD.ui.preset.address = function(field, context) {
     var event = d3.dispatch('change'),
-        housename,
         housenumber,
         street,
         city,
         housenumber,
         street,
         city,
@@ -29372,12 +29506,6 @@ iD.ui.preset.address = function(field, context) {
         var enter = wrap.enter().append('div')
             .attr('class', 'preset-input-wrap');
 
         var enter = wrap.enter().append('div')
             .attr('class', 'preset-input-wrap');
 
-        enter.append('input')
-            .property('type', 'text')
-            .attr('placeholder', field.t('placeholders.housename'))
-            .attr('class', 'addr-housename')
-            .attr('id', 'preset-input-' + field.id);
-
         enter.append('input')
             .property('type', 'text')
             .attr('placeholder', field.t('placeholders.number'))
         enter.append('input')
             .property('type', 'text')
             .attr('placeholder', field.t('placeholders.number'))
@@ -29400,7 +29528,6 @@ iD.ui.preset.address = function(field, context) {
 
         // Update
 
 
         // Update
 
-        housename = wrap.select('.addr-housename');
         housenumber = wrap.select('.addr-number');
         street = wrap.select('.addr-street');
         city = wrap.select('.addr-city');
         housenumber = wrap.select('.addr-number');
         street = wrap.select('.addr-street');
         city = wrap.select('.addr-city');
@@ -29431,7 +29558,6 @@ iD.ui.preset.address = function(field, context) {
 
     function change() {
         event.change({
 
     function change() {
         event.change({
-            'addr:housename': housename.value() || undefined,
             'addr:housenumber': housenumber.value() || undefined,
             'addr:street': street.value() || undefined,
             'addr:city': city.value() || undefined,
             'addr:housenumber': housenumber.value() || undefined,
             'addr:street': street.value() || undefined,
             'addr:city': city.value() || undefined,
@@ -29446,7 +29572,6 @@ iD.ui.preset.address = function(field, context) {
     };
 
     address.tags = function(tags) {
     };
 
     address.tags = function(tags) {
-        housename.value(tags['addr:housename'] || '');
         housenumber.value(tags['addr:housenumber'] || '');
         street.value(tags['addr:street'] || '');
         city.value(tags['addr:city'] || '');
         housenumber.value(tags['addr:housenumber'] || '');
         street.value(tags['addr:street'] || '');
         city.value(tags['addr:city'] || '');
@@ -29454,7 +29579,7 @@ iD.ui.preset.address = function(field, context) {
     };
 
     address.focus = function() {
     };
 
     address.focus = function() {
-        housename.node().focus();
+        housenumber.node().focus();
     };
 
     return d3.rebind(address, event, 'on');
     };
 
     return d3.rebind(address, event, 'on');
@@ -31135,9 +31260,11 @@ iD.presets.Preset = function(id, preset, fields) {
 
     var applyTags = preset.addTags || preset.tags;
     preset.applyTags = function(tags, geometry) {
 
     var applyTags = preset.addTags || preset.tags;
     preset.applyTags = function(tags, geometry) {
+        var k;
+
         tags = _.clone(tags);
 
         tags = _.clone(tags);
 
-        for (var k in applyTags) {
+        for (k in applyTags) {
             if (applyTags[k] === '*') {
                 tags[k] = 'yes';
             } else {
             if (applyTags[k] === '*') {
                 tags[k] = 'yes';
             } else {
@@ -31145,6 +31272,13 @@ iD.presets.Preset = function(id, preset, fields) {
             }
         }
 
             }
         }
 
+        // Add area=yes if necessary
+        for (k in applyTags) {
+            if (geometry === 'area' && !(k in iD.areaKeys))
+                tags.area = 'yes';
+            break;
+        }
+
         for (var f in preset.fields) {
             var field = preset.fields[f];
             if (field.matchGeometry(geometry) && field.key && !tags[field.key] && field['default']) {
         for (var f in preset.fields) {
             var field = preset.fields[f];
             if (field.matchGeometry(geometry) && field.key && !tags[field.key] && field['default']) {
@@ -40584,7 +40718,101 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "overlay": true
         },
         {
             "overlay": true
         },
         {
-            "name": "Lithuania - ORT10LT",
+            "name": "Landsat 233055",
+            "type": "tms",
+            "description": "Recent Landsat imagery",
+            "template": "http://{switch:a,b,c,d}.tile.paulnorman.ca/landsat_233055/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                5,
+                14
+            ],
+            "polygon": [
+                [
+                    [
+                        -60.8550011,
+                        6.1765004
+                    ],
+                    [
+                        -60.4762612,
+                        7.9188291
+                    ],
+                    [
+                        -62.161689,
+                        8.2778675
+                    ],
+                    [
+                        -62.5322549,
+                        6.5375488
+                    ]
+                ]
+            ],
+            "id": "landsat_233055"
+        },
+        {
+            "name": "Latest southwest British Columbia Landsat",
+            "type": "tms",
+            "description": "Recent lower-resolution landwsat imagery for southwest British Columbia",
+            "template": "http://{switch:a,b,c,d}.tile.paulnorman.ca/landsat_047026/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                5,
+                13
+            ],
+            "polygon": [
+                [
+                    [
+                        -121.9355512,
+                        47.7820648
+                    ],
+                    [
+                        -121.5720582,
+                        48.6410125
+                    ],
+                    [
+                        -121.2015461,
+                        49.4846247
+                    ],
+                    [
+                        -121.8375516,
+                        49.6023246
+                    ],
+                    [
+                        -122.4767046,
+                        49.7161735
+                    ],
+                    [
+                        -123.118912,
+                        49.8268824
+                    ],
+                    [
+                        -123.760228,
+                        49.9335836
+                    ],
+                    [
+                        -124.0887706,
+                        49.0870469
+                    ],
+                    [
+                        -124.4128889,
+                        48.2252567
+                    ],
+                    [
+                        -123.792772,
+                        48.1197334
+                    ],
+                    [
+                        -123.1727942,
+                        48.0109592
+                    ],
+                    [
+                        -122.553553,
+                        47.8982299
+                    ]
+                ]
+            ],
+            "id": "landsat_047026"
+        },
+        {
+            "name": "Lithuania - NŽT ORT10LT",
             "type": "tms",
             "template": "http://mapproxy.openmap.lt/ort10lt/g/{z}/{x}/{y}.jpeg",
             "scaleExtent": [
             "type": "tms",
             "template": "http://mapproxy.openmap.lt/ort10lt/g/{z}/{x}/{y}.jpeg",
             "scaleExtent": [
@@ -40594,27 +40822,165 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "polygon": [
                 [
                     [
             "polygon": [
                 [
                     [
-                        21,
-                        53.88
+                        21.4926054,
+                        56.3592046
                     ],
                     [
                     ],
                     [
-                        21,
-                        56.45
+                        21.8134688,
+                        56.4097144
                     ],
                     [
                     ],
                     [
-                        26.85,
-                        56.45
+                        21.9728753,
+                        56.4567587
                     ],
                     [
                     ],
                     [
-                        26.85,
-                        53.88
+                        22.2158294,
+                        56.4604404
                     ],
                     [
                     ],
                     [
-                        21,
-                        53.88
+                        22.2183922,
+                        56.4162361
+                    ],
+                    [
+                        23.3511527,
+                        56.4267251
+                    ],
+                    [
+                        23.3521778,
+                        56.3824815
+                    ],
+                    [
+                        23.9179035,
+                        56.383305
+                    ],
+                    [
+                        23.9176231,
+                        56.3392908
+                    ],
+                    [
+                        24.5649817,
+                        56.3382169
+                    ],
+                    [
+                        24.564933,
+                        56.3828587
+                    ],
+                    [
+                        24.6475683,
+                        56.4277798
+                    ],
+                    [
+                        24.8099394,
+                        56.470646
+                    ],
+                    [
+                        24.9733979,
+                        56.4698452
+                    ],
+                    [
+                        25.1299701,
+                        56.2890356
+                    ],
+                    [
+                        25.127433,
+                        56.1990144
+                    ],
+                    [
+                        25.6921076,
+                        56.1933684
+                    ],
+                    [
+                        26.0839005,
+                        56.0067879
+                    ],
+                    [
+                        26.4673573,
+                        55.7304232
+                    ],
+                    [
+                        26.5463565,
+                        55.7132705
+                    ],
+                    [
+                        26.5154447,
+                        55.2345969
+                    ],
+                    [
+                        25.7874641,
+                        54.8425656
+                    ],
+                    [
+                        25.7675259,
+                        54.6350898
+                    ],
+                    [
+                        25.6165253,
+                        54.4404007
+                    ],
+                    [
+                        24.4566043,
+                        53.9577649
+                    ],
+                    [
+                        23.6164786,
+                        53.9575517
+                    ],
+                    [
+                        23.5632006,
+                        54.048085
+                    ],
+                    [
+                        22.8462074,
+                        54.3563682
+                    ],
+                    [
+                        22.831944,
+                        54.9414849
+                    ],
+                    [
+                        22.4306085,
+                        55.1159913
+                    ],
+                    [
+                        21.9605898,
+                        55.1107144
+                    ],
+                    [
+                        21.7253241,
+                        55.1496885
+                    ],
+                    [
+                        21.5628422,
+                        55.2362913
+                    ],
+                    [
+                        21.2209638,
+                        55.2742668
+                    ],
+                    [
+                        21.1630444,
+                        55.2803979
+                    ],
+                    [
+                        20.9277788,
+                        55.3101641
+                    ],
+                    [
+                        20.9257285,
+                        55.3588507
+                    ],
+                    [
+                        20.9980451,
+                        55.4514157
+                    ],
+                    [
+                        21.0282249,
+                        56.0796297
                     ]
                 ]
                     ]
                 ]
-            ]
+            ],
+            "terms_url": "http://www.geoportal.lt",
+            "terms_text": "NŽT ORT10LT"
         },
         {
             "name": "Locator Overlay",
         },
         {
             "name": "Locator Overlay",
@@ -45271,7 +45637,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "name": "New & Misaligned TIGER Roads",
             "type": "tms",
             "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap",
             "name": "New & Misaligned TIGER Roads",
             "type": "tms",
             "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap",
-            "template": "http://{switch:a,b,c}.tiles.mapbox.com/v3/enf.ho204tap,enf.ho20a3n1,enf.game1617/{zoom}/{x}/{y}.png",
+            "template": "http://{switch:a,b,c}.tiles.mapbox.com/v3/enf.y5c4ygb9,enf.ho20a3n1,enf.game1617/{zoom}/{x}/{y}.png",
             "scaleExtent": [
                 0,
                 22
             "scaleExtent": [
                 0,
                 22
@@ -51745,27 +52111,483 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "name": "Surrey Air Survey",
             "type": "tms",
             "template": "http://gravitystorm.dev.openstreetmap.org/surrey/{zoom}/{x}/{y}.png",
             "name": "Surrey Air Survey",
             "type": "tms",
             "template": "http://gravitystorm.dev.openstreetmap.org/surrey/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                8,
+                19
+            ],
             "polygon": [
                 [
                     [
             "polygon": [
                 [
                     [
-                        -0.856,
-                        51.071
+                        -0.752478,
+                        51.0821941
+                    ],
+                    [
+                        -0.7595183,
+                        51.0856254
+                    ],
+                    [
+                        -0.8014342,
+                        51.1457917
+                    ],
+                    [
+                        -0.8398864,
+                        51.1440686
+                    ],
+                    [
+                        -0.8357665,
+                        51.1802397
+                    ],
+                    [
+                        -0.8529549,
+                        51.2011266
+                    ],
+                    [
+                        -0.8522683,
+                        51.2096231
+                    ],
+                    [
+                        -0.8495217,
+                        51.217903
+                    ],
+                    [
+                        -0.8266907,
+                        51.2403696
+                    ],
+                    [
+                        -0.8120995,
+                        51.2469248
+                    ],
+                    [
+                        -0.7736474,
+                        51.2459577
+                    ],
+                    [
+                        -0.7544213,
+                        51.2381127
+                    ],
+                    [
+                        -0.754078,
+                        51.233921
+                    ],
+                    [
+                        -0.7446366,
+                        51.2333836
+                    ],
+                    [
+                        -0.7430693,
+                        51.2847178
+                    ],
+                    [
+                        -0.751503,
+                        51.3069524
+                    ],
+                    [
+                        -0.7664376,
+                        51.3121032
+                    ],
+                    [
+                        -0.7820588,
+                        51.3270157
+                    ],
+                    [
+                        -0.7815438,
+                        51.3388135
+                    ],
+                    [
+                        -0.7374268,
+                        51.3720456
+                    ],
+                    [
+                        -0.7192307,
+                        51.3769748
+                    ],
+                    [
+                        -0.6795769,
+                        51.3847961
+                    ],
+                    [
+                        -0.6807786,
+                        51.3901523
+                    ],
+                    [
+                        -0.6531411,
+                        51.3917591
+                    ],
+                    [
+                        -0.6301385,
+                        51.3905808
+                    ],
+                    [
+                        -0.6291085,
+                        51.3970074
+                    ],
+                    [
+                        -0.6234437,
+                        51.3977572
+                    ],
+                    [
+                        -0.613144,
+                        51.4295552
+                    ],
+                    [
+                        -0.6002471,
+                        51.4459121
+                    ],
+                    [
+                        -0.5867081,
+                        51.4445365
+                    ],
+                    [
+                        -0.5762368,
+                        51.453202
+                    ],
+                    [
+                        -0.5626755,
+                        51.4523462
+                    ],
+                    [
+                        -0.547741,
+                        51.4469972
+                    ],
+                    [
+                        -0.5372697,
+                        51.4448575
+                    ],
+                    [
+                        -0.537098,
+                        51.4526671
+                    ],
+                    [
+                        -0.5439644,
+                        51.4545926
+                    ],
+                    [
+                        -0.5405312,
+                        51.4698865
+                    ],
+                    [
+                        -0.5309182,
+                        51.4760881
+                    ],
+                    [
+                        -0.5091172,
+                        51.4744843
+                    ],
+                    [
+                        -0.5086022,
+                        51.4695657
+                    ],
+                    [
+                        -0.4900628,
+                        51.4682825
+                    ],
+                    [
+                        -0.4526406,
+                        51.4606894
+                    ],
+                    [
+                        -0.4486924,
+                        51.4429316
+                    ],
+                    [
+                        -0.4414826,
+                        51.4418616
+                    ],
+                    [
+                        -0.4418259,
+                        51.4369394
+                    ],
+                    [
+                        -0.4112702,
+                        51.4380095
+                    ],
+                    [
+                        -0.4014855,
+                        51.4279498
+                    ],
+                    [
+                        -0.3807145,
+                        51.4262372
+                    ],
+                    [
+                        -0.3805428,
+                        51.4161749
+                    ],
+                    [
+                        -0.3491288,
+                        51.4138195
+                    ],
+                    [
+                        -0.3274994,
+                        51.4037544
+                    ],
+                    [
+                        -0.3039818,
+                        51.3990424
+                    ],
+                    [
+                        -0.3019219,
+                        51.3754747
+                    ],
+                    [
+                        -0.309475,
+                        51.369688
+                    ],
+                    [
+                        -0.3111916,
+                        51.3529669
+                    ],
+                    [
+                        -0.2955704,
+                        51.3541462
+                    ],
+                    [
+                        -0.2923089,
+                        51.3673303
+                    ],
+                    [
+                        -0.2850991,
+                        51.3680805
+                    ],
+                    [
+                        -0.2787476,
+                        51.3771891
+                    ],
+                    [
+                        -0.2655297,
+                        51.3837247
+                    ],
+                    [
+                        -0.2411538,
+                        51.3847961
+                    ],
+                    [
+                        -0.2123147,
+                        51.3628288
+                    ],
+                    [
+                        -0.2107697,
+                        51.3498578
+                    ],
+                    [
+                        -0.190857,
+                        51.3502867
+                    ],
+                    [
+                        -0.1542931,
+                        51.3338802
+                    ],
+                    [
+                        -0.1496583,
+                        51.3057719
+                    ],
+                    [
+                        -0.1074296,
+                        51.2966491
+                    ],
+                    [
+                        -0.0887185,
+                        51.3099571
+                    ],
+                    [
+                        -0.0878602,
+                        51.3220811
+                    ],
+                    [
+                        -0.0652009,
+                        51.3215448
+                    ],
+                    [
+                        -0.0641709,
+                        51.3264793
+                    ],
+                    [
+                        -0.0519829,
+                        51.3263721
+                    ],
+                    [
+                        -0.0528412,
+                        51.334631
+                    ],
+                    [
+                        -0.0330779,
+                        51.3430876
+                    ],
+                    [
+                        0.0019187,
+                        51.3376339
+                    ],
+                    [
+                        0.0118751,
+                        51.3281956
+                    ],
+                    [
+                        0.013935,
+                        51.2994398
+                    ],
+                    [
+                        0.0202865,
+                        51.2994398
+                    ],
+                    [
+                        0.0240631,
+                        51.3072743
+                    ],
+                    [
+                        0.0331611,
+                        51.3086694
+                    ],
+                    [
+                        0.0455207,
+                        51.30545
+                    ],
+                    [
+                        0.0523872,
+                        51.2877392
+                    ],
+                    [
+                        0.0616569,
+                        51.2577764
+                    ],
+                    [
+                        0.0640602,
+                        51.2415518
+                    ],
+                    [
+                        0.0462074,
+                        51.2126342
+                    ],
+                    [
+                        0.0407142,
+                        51.2109136
+                    ],
+                    [
+                        0.0448341,
+                        51.1989753
+                    ],
+                    [
+                        0.0494689,
+                        51.1997283
+                    ],
+                    [
+                        0.0558204,
+                        51.1944573
+                    ],
+                    [
+                        0.0611419,
+                        51.1790713
+                    ],
+                    [
+                        0.0623435,
+                        51.1542061
+                    ],
+                    [
+                        0.0577087,
+                        51.1417146
+                    ],
+                    [
+                        0.0204582,
+                        51.1365447
+                    ],
+                    [
+                        -0.0446015,
+                        51.1336364
+                    ],
+                    [
+                        -0.1566964,
+                        51.1352522
+                    ],
+                    [
+                        -0.1572114,
+                        51.1290043
+                    ],
+                    [
+                        -0.2287942,
+                        51.1183379
+                    ],
+                    [
+                        -0.2473336,
+                        51.1183379
+                    ],
+                    [
+                        -0.2500802,
+                        51.1211394
+                    ],
+                    [
+                        -0.299347,
+                        51.1137042
+                    ],
+                    [
+                        -0.3221779,
+                        51.1119799
+                    ],
+                    [
+                        -0.3223496,
+                        51.1058367
+                    ],
+                    [
+                        -0.3596001,
+                        51.1019563
+                    ],
+                    [
+                        -0.3589135,
+                        51.1113333
+                    ],
+                    [
+                        -0.3863793,
+                        51.1117644
+                    ],
+                    [
+                        -0.3869014,
+                        51.1062516
+                    ],
+                    [
+                        -0.4281001,
+                        51.0947174
+                    ],
+                    [
+                        -0.4856784,
+                        51.0951554
+                    ],
+                    [
+                        -0.487135,
+                        51.0872266
+                    ],
+                    [
+                        -0.5297404,
+                        51.0865404
+                    ],
+                    [
+                        -0.5302259,
+                        51.0789914
+                    ],
+                    [
+                        -0.61046,
+                        51.076551
+                    ],
+                    [
+                        -0.6099745,
+                        51.080669
+                    ],
+                    [
+                        -0.6577994,
+                        51.0792202
                     ],
                     [
                     ],
                     [
-                        -0.856,
-                        51.473
+                        -0.6582849,
+                        51.0743394
                     ],
                     [
                     ],
                     [
-                        0.062,
-                        51.473
+                        -0.6836539,
+                        51.0707547
                     ],
                     [
                     ],
                     [
-                        0.062,
-                        51.071
+                        -0.6997979,
+                        51.070831
                     ],
                     [
                     ],
                     [
-                        -0.856,
-                        51.071
+                        -0.7296581,
+                        51.0744919
                     ]
                 ]
             ]
                     ]
                 ]
             ]
@@ -61191,9 +62013,169 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "addr:housenumber": "*"
                 },
                 "addTags": {},
                     "addr:housenumber": "*"
                 },
                 "addTags": {},
+                "removeTags": {},
                 "matchScore": 0.2,
                 "name": "Address"
             },
                 "matchScore": 0.2,
                 "name": "Address"
             },
+            "aerialway": {
+                "fields": [
+                    "aerialway"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "line"
+                ],
+                "tags": {
+                    "aerialway": "*"
+                },
+                "terms": [
+                    "ski lift",
+                    "funifor",
+                    "funitel"
+                ],
+                "name": "Aerialway"
+            },
+            "aerialway/cable_car": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "tramway",
+                    "ropeway"
+                ],
+                "fields": [
+                    "aerialway/occupancy",
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "cable_car"
+                },
+                "name": "Cable Car"
+            },
+            "aerialway/chair_lift": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/occupancy",
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/bubble",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "chair_lift"
+                },
+                "name": "Chair Lift"
+            },
+            "aerialway/gondola": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/occupancy",
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/bubble",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "gondola"
+                },
+                "name": "Gondola"
+            },
+            "aerialway/magic_carpet": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "magic_carpet"
+                },
+                "name": "Magic Carpet Lift"
+            },
+            "aerialway/platter": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "button lift",
+                    "poma lift"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration"
+                ],
+                "tags": {
+                    "aerialway": "platter"
+                },
+                "name": "Platter Lift"
+            },
+            "aerialway/pylon": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "fields": [
+                    "ref"
+                ],
+                "tags": {
+                    "aerialway": "pylon"
+                },
+                "name": "Aerialway Pylon"
+            },
+            "aerialway/rope_tow": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "handle tow",
+                    "bugel lift"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration"
+                ],
+                "tags": {
+                    "aerialway": "rope_tow"
+                },
+                "name": "Rope Tow Lift"
+            },
+            "aerialway/station": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "fields": [
+                    "aerialway/access",
+                    "aerialway/summer/access",
+                    "elevation"
+                ],
+                "tags": {
+                    "aerialway": "station"
+                },
+                "name": "Aerialway Station"
+            },
+            "aerialway/t-bar": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration"
+                ],
+                "tags": {
+                    "aerialway": "t-bar"
+                },
+                "name": "T-bar Lift"
+            },
             "aeroway": {
                 "icon": "airport",
                 "fields": [
             "aeroway": {
                 "icon": "airport",
                 "fields": [
@@ -61390,7 +62372,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "atm",
                     "building_area",
                 "fields": [
                     "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -61429,7 +62412,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bar",
                 "fields": [
                     "building_area",
                 "icon": "bar",
                 "fields": [
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -61511,7 +62495,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "cuisine",
                     "internet_access",
                     "building_area",
                     "cuisine",
                     "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -61626,6 +62611,36 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Cinema"
             },
                 },
                 "name": "Cinema"
             },
+            "amenity/clinic": {
+                "name": "Clinic",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "clinic",
+                    "medical clinic"
+                ],
+                "tags": {
+                    "amenity": "clinic"
+                },
+                "icon": "hospital",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ]
+            },
+            "amenity/clock": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "amenity": "clock"
+                },
+                "name": "Clock"
+            },
             "amenity/college": {
                 "icon": "college",
                 "fields": [
             "amenity/college": {
                 "icon": "college",
                 "fields": [
@@ -61658,6 +62673,46 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Courthouse"
             },
                 },
                 "name": "Courthouse"
             },
+            "amenity/dentist": {
+                "name": "Dentist",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "dentist",
+                    "dentist's office"
+                ],
+                "tags": {
+                    "amenity": "dentist"
+                },
+                "icon": "hospital",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ]
+            },
+            "amenity/doctor": {
+                "name": "Doctor",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "doctor",
+                    "doctor's office"
+                ],
+                "tags": {
+                    "amenity": "doctors"
+                },
+                "icon": "hospital",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ]
+            },
             "amenity/drinking_water": {
                 "icon": "water",
                 "geometry": [
             "amenity/drinking_water": {
                 "icon": "water",
                 "geometry": [
@@ -61692,7 +62747,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -61885,7 +62941,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "operator",
                     "building_area",
                 "fields": [
                     "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -62145,7 +63202,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "fields": [
                     "building_area",
                 "icon": "beer",
                 "fields": [
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -62208,6 +63266,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "cuisine",
                     "building_area",
                     "address",
                     "cuisine",
                     "building_area",
                     "address",
+                    "opening_hours",
                     "capacity"
                 ],
                 "geometry": [
                     "capacity"
                 ],
                 "geometry": [
@@ -62306,6 +63365,119 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "name": "Shelter"
             },
                 ],
                 "name": "Shelter"
             },
+            "amenity/social_facility": {
+                "name": "Social Facility",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [],
+                "tags": {
+                    "amenity": "social_facility"
+                },
+                "fields": [
+                    "social_facility_for",
+                    "address",
+                    "phone",
+                    "opening_hours",
+                    "wheelchair",
+                    "operator"
+                ]
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Food Bank",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [],
+                "tags": {
+                    "amenity": "social_facility",
+                    "social_facility": "food_bank"
+                },
+                "fields": [
+                    "social_facility_for",
+                    "address",
+                    "phone",
+                    "opening_hours",
+                    "wheelchair",
+                    "operator"
+                ]
+            },
+            "amenity/social_facility/group_home": {
+                "name": "Group Home",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "elderly",
+                    "old",
+                    "senior living"
+                ],
+                "tags": {
+                    "amenity": "social_facility",
+                    "social_facility": "group_home",
+                    "social_facility_for": "senior"
+                },
+                "fields": [
+                    "social_facility_for",
+                    "address",
+                    "phone",
+                    "opening_hours",
+                    "wheelchair",
+                    "operator"
+                ]
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Homeless Shelter",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "houseless",
+                    "unhoused",
+                    "displaced"
+                ],
+                "tags": {
+                    "amenity": "social_facility",
+                    "social_facility": "shelter",
+                    "social_facility:for": "homeless"
+                },
+                "fields": [
+                    "social_facility_for",
+                    "address",
+                    "phone",
+                    "opening_hours",
+                    "wheelchair",
+                    "operator"
+                ]
+            },
+            "amenity/studio": {
+                "name": "Studio",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "recording studio",
+                    "studio",
+                    "radio",
+                    "radio studio",
+                    "television",
+                    "television studio"
+                ],
+                "tags": {
+                    "amenity": "studio"
+                },
+                "icon": "music",
+                "fields": [
+                    "building_area",
+                    "studio_type",
+                    "address"
+                ]
+            },
             "amenity/swimming_pool": {
                 "geometry": [
                     "point",
             "amenity/swimming_pool": {
                 "geometry": [
                     "point",
@@ -62461,6 +63633,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Vending Machine"
             },
                 },
                 "name": "Vending Machine"
             },
+            "amenity/veterinary": {
+                "fields": [],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "pet clinic",
+                    "veterinarian",
+                    "animal hospital",
+                    "pet doctor"
+                ],
+                "tags": {
+                    "amenity": "veterinary"
+                },
+                "name": "Veterinary"
+            },
             "amenity/waste_basket": {
                 "icon": "waste-basket",
                 "geometry": [
             "amenity/waste_basket": {
                 "icon": "waste-basket",
                 "geometry": [
@@ -62730,6 +63919,102 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Apartments"
             },
                 },
                 "name": "Apartments"
             },
+            "building/barn": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "barn"
+                },
+                "name": "Barn"
+            },
+            "building/bunker": {
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "bunker"
+                },
+                "name": "Bunker",
+                "searchable": false
+            },
+            "building/cabin": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "cabin"
+                },
+                "name": "Cabin"
+            },
+            "building/cathedral": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "cathedral"
+                },
+                "name": "Cathedral"
+            },
+            "building/chapel": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "chapel"
+                },
+                "name": "Chapel"
+            },
+            "building/church": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "church"
+                },
+                "name": "Church"
+            },
             "building/commercial": {
                 "icon": "commercial",
                 "geometry": [
             "building/commercial": {
                 "icon": "commercial",
                 "geometry": [
@@ -62742,6 +64027,54 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Commercial Building"
             },
                 },
                 "name": "Commercial Building"
             },
+            "building/construction": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "construction"
+                },
+                "name": "Building Under Construction"
+            },
+            "building/detached": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "detached"
+                },
+                "name": "Detached Home"
+            },
+            "building/dormitory": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "dormitory"
+                },
+                "name": "Dormitory"
+            },
             "building/entrance": {
                 "icon": "entrance",
                 "geometry": [
             "building/entrance": {
                 "icon": "entrance",
                 "geometry": [
@@ -62768,6 +64101,69 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Garage",
                 "icon": "warehouse"
             },
                 "name": "Garage",
                 "icon": "warehouse"
             },
+            "building/garages": {
+                "icon": "warehouse",
+                "fields": [
+                    "capacity"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "garages"
+                },
+                "name": "Garages"
+            },
+            "building/greenhouse": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "greenhouse"
+                },
+                "name": "Greenhouse"
+            },
+            "building/hospital": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "hospital"
+                },
+                "name": "Hospital Building"
+            },
+            "building/hotel": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "hotel"
+                },
+                "name": "Hotel Building"
+            },
             "building/house": {
                 "icon": "building",
                 "fields": [
             "building/house": {
                 "icon": "building",
                 "fields": [
@@ -62810,7 +64206,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Industrial Building"
             },
                 },
                 "name": "Industrial Building"
             },
-            "building/residential": {
+            "building/public": {
                 "icon": "building",
                 "fields": [
                     "address",
                 "icon": "building",
                 "fields": [
                     "address",
@@ -62822,971 +64218,2896 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "building": "residential"
+                    "building": "public"
                 },
                 },
-                "name": "Residential Building"
+                "name": "Public Building"
             },
             },
-            "embankment": {
+            "building/residential": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "embankment": "yes"
+                    "building": "residential"
                 },
                 },
-                "name": "Embankment",
-                "matchScore": 0.2
+                "name": "Residential Building"
             },
             },
-            "emergency/ambulance_station": {
+            "building/retail": {
+                "icon": "building",
                 "fields": [
                 "fields": [
-                    "operator"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "area",
                     "point",
                     "point",
-                    "vertex"
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "emergency": "ambulance_station"
+                    "building": "retail"
                 },
                 },
-                "name": "Ambulance Station"
+                "name": "Retail Building"
             },
             },
-            "emergency/fire_hydrant": {
+            "building/roof": {
+                "icon": "building",
                 "fields": [
                 "fields": [
-                    "fire_hydrant/type"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "emergency": "fire_hydrant"
+                    "building": "roof"
                 },
                 },
-                "name": "Fire Hydrant"
+                "name": "Roof"
             },
             },
-            "emergency/phone": {
-                "icon": "emergency-telephone",
+            "building/school": {
+                "icon": "building",
                 "fields": [
                 "fields": [
-                    "operator"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "emergency": "phone"
+                    "building": "school"
                 },
                 },
-                "name": "Emergency Phone"
+                "name": "School Building"
             },
             },
-            "entrance": {
-                "icon": "entrance",
+            "building/shed": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
                 "geometry": [
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "entrance": "*"
+                    "building": "shed"
                 },
                 },
-                "fields": [
-                    "entrance",
-                    "access_simple",
-                    "address"
-                ],
-                "name": "Entrance"
+                "name": "Shed"
             },
             },
-            "footway/crossing": {
+            "building/stable": {
+                "icon": "building",
                 "fields": [
                 "fields": [
-                    "crossing",
-                    "access",
-                    "surface"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "footway",
-                    "footway": "crossing"
+                    "building": "stable"
                 },
                 },
-                "terms": [
-                    "crosswalk",
-                    "zebra crossing"
-                ],
-                "name": "Crossing"
+                "name": "Stable"
             },
             },
-            "footway/sidewalk": {
+            "building/static_caravan": {
+                "icon": "building",
                 "fields": [
                 "fields": [
-                    "surface",
-                    "lit",
-                    "access"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "footway",
-                    "footway": "sidewalk"
+                    "building": "static_caravan"
                 },
                 },
-                "terms": [],
-                "name": "Sidewalk"
+                "name": "Static Mobile Home"
             },
             },
-            "golf/bunker": {
-                "icon": "golf",
+            "building/terrace": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
                 "geometry": [
                 "geometry": [
+                    "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "golf": "bunker",
-                    "natural": "sand"
+                    "building": "terrace"
                 },
                 },
-                "terms": [
-                    "hazard",
-                    "bunker"
-                ],
-                "name": "Sand Trap"
+                "name": "Row Houses"
             },
             },
-            "golf/fairway": {
-                "icon": "golf",
+            "building/train_station": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
                 "geometry": [
                 "geometry": [
+                    "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "golf": "fairway",
-                    "landuse": "grass"
+                    "building": "train_station"
                 },
                 },
-                "name": "Fairway"
+                "name": "Train Station",
+                "searchable": false
             },
             },
-            "golf/green": {
-                "icon": "golf",
+            "building/university": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
                 "geometry": [
                 "geometry": [
+                    "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "golf": "green",
-                    "landuse": "grass",
-                    "leisure": "pitch",
-                    "sport": "golf"
+                    "building": "university"
                 },
                 },
-                "terms": [
-                    "putting green"
-                ],
-                "name": "Putting Green"
+                "name": "University Building"
             },
             },
-            "golf/hole": {
-                "icon": "golf",
+            "building/warehouse": {
+                "icon": "building",
                 "fields": [
                 "fields": [
-                    "golf_hole",
-                    "par",
-                    "handicap"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "golf": "hole"
+                    "building": "warehouse"
                 },
                 },
-                "name": "Golf Hole"
+                "name": "Warehouse"
             },
             },
-            "golf/lateral_water_hazard": {
-                "icon": "golf",
+            "craft/basket_maker": {
+                "name": "Basket Maker",
                 "geometry": [
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
                     "area"
                 ],
+                "terms": [
+                    "basket",
+                    "basketry",
+                    "basket maker",
+                    "basket weaver"
+                ],
                 "tags": {
                 "tags": {
-                    "golf": "lateral_water_hazard",
-                    "natural": "water"
+                    "craft": "basket_maker"
                 },
                 },
-                "name": "Lateral Water Hazard"
+                "icon": "art-gallery",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
             },
-            "golf/rough": {
-                "icon": "golf",
+            "craft/beekeeper": {
+                "name": "Beekeeper",
                 "geometry": [
                 "geometry": [
+                    "point",
                     "area"
                 ],
                     "area"
                 ],
+                "terms": [
+                    "bees",
+                    "beekeeper",
+                    "bee box"
+                ],
                 "tags": {
                 "tags": {
-                    "golf": "rough",
-                    "landuse": "grass"
+                    "craft": "beekeeper"
                 },
                 },
-                "name": "Rough"
+                "icon": "farm",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
             },
-            "golf/tee": {
-                "icon": "golf",
+            "craft/blacksmith": {
+                "name": "Blacksmith",
                 "geometry": [
                 "geometry": [
+                    "point",
                     "area"
                 ],
                     "area"
                 ],
-                "tags": {
-                    "golf": "tee",
-                    "landuse": "grass"
-                },
                 "terms": [
                 "terms": [
-                    "teeing ground"
+                    "blacksmith"
                 ],
                 ],
-                "name": "Tee Box"
+                "tags": {
+                    "craft": "blacksmith"
+                },
+                "icon": "farm",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
             },
-            "golf/water_hazard": {
-                "icon": "golf",
+            "craft/boatbuilder": {
+                "name": "Boat Builder",
                 "geometry": [
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
                     "area"
                 ],
+                "terms": [
+                    "boat builder"
+                ],
                 "tags": {
                 "tags": {
-                    "golf": "water_hazard",
-                    "natural": "water"
+                    "craft": "boatbuilder"
                 },
                 },
-                "name": "Water Hazard"
-            },
-            "highway": {
+                "icon": "marker-stroked",
                 "fields": [
                 "fields": [
-                    "highway"
-                ],
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/bookbinder": {
+                "name": "Bookbinder",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line",
                     "area"
                 ],
                     "area"
                 ],
+                "terms": [
+                    "bookbinder",
+                    "book repair"
+                ],
                 "tags": {
                 "tags": {
-                    "highway": "*"
+                    "craft": "bookbinder"
                 },
                 },
-                "name": "Highway"
-            },
-            "highway/bridleway": {
+                "icon": "library",
                 "fields": [
                 "fields": [
-                    "access",
-                    "surface",
-                    "structure"
-                ],
-                "icon": "highway-bridleway",
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/brewery": {
+                "name": "Brewery",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "highway": "bridleway"
-                },
                 "terms": [
                 "terms": [
-                    "bridleway",
-                    "equestrian trail",
-                    "horse riding path",
-                    "bridle road",
-                    "horse trail"
+                    "brewery"
                 ],
                 ],
-                "name": "Bridle Path"
-            },
-            "highway/bus_stop": {
-                "icon": "bus",
+                "tags": {
+                    "craft": "brewery"
+                },
+                "icon": "beer",
                 "fields": [
                 "fields": [
+                    "building_area",
+                    "address",
                     "operator",
                     "operator",
-                    "shelter"
-                ],
+                    "opening_hours"
+                ]
+            },
+            "craft/carpenter": {
+                "name": "Carpenter",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
+                ],
+                "terms": [
+                    "carpenter",
+                    "woodworker"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "bus_stop"
+                    "craft": "carpenter"
                 },
                 },
-                "terms": [],
-                "name": "Bus Stop"
-            },
-            "highway/crossing": {
+                "icon": "logging",
                 "fields": [
                 "fields": [
-                    "crossing"
-                ],
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/carpet_layer": {
+                "name": "Carpet Layer",
                 "geometry": [
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "highway": "crossing"
-                },
                 "terms": [
                 "terms": [
-                    "crosswalk",
-                    "zebra crossing"
-                ],
-                "name": "Crossing"
-            },
-            "highway/cycleway": {
-                "icon": "highway-cycleway",
-                "fields": [
-                    "surface",
-                    "lit",
-                    "structure",
-                    "access",
-                    "oneway"
-                ],
-                "geometry": [
-                    "line"
+                    "carpet layer"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "cycleway"
+                    "craft": "carpet_layer"
                 },
                 },
-                "terms": [],
-                "name": "Cycle Path"
-            },
-            "highway/footway": {
-                "icon": "highway-footway",
+                "icon": "square",
                 "fields": [
                 "fields": [
-                    "structure",
-                    "access",
-                    "surface"
-                ],
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/caterer": {
+                "name": "Caterer",
                 "geometry": [
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
                 "terms": [
                     "area"
                 ],
                 "terms": [
-                    "beaten path",
-                    "boulevard",
-                    "clearing",
-                    "course",
-                    "cut*",
-                    "drag*",
-                    "footpath",
-                    "highway",
-                    "lane",
-                    "line",
-                    "orbit",
-                    "passage",
-                    "pathway",
-                    "rail",
-                    "rails",
-                    "road",
-                    "roadway",
-                    "route",
-                    "street",
-                    "thoroughfare",
-                    "trackway",
-                    "trail",
-                    "trajectory",
-                    "walk"
+                    "Caterer",
+                    "Catering"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "footway"
+                    "craft": "caterer"
                 },
                 },
-                "name": "Foot Path"
-            },
-            "highway/living_street": {
-                "icon": "highway-living-street",
+                "icon": "bakery",
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface"
-                ],
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/clockmaker": {
+                "name": "Clockmaker",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "clock",
+                    "clockmaker",
+                    "clock repair"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "living_street"
+                    "craft": "clockmaker"
                 },
                 },
-                "name": "Living Street"
+                "icon": "circle-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
             },
-            "highway/mini_roundabout": {
+            "craft/confectionary": {
+                "name": "Confectionary",
                 "geometry": [
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "confectionary",
+                    "sweets",
+                    "candy"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "mini_roundabout"
+                    "craft": "confectionary"
                 },
                 },
+                "icon": "bakery",
                 "fields": [
                 "fields": [
-                    "clock_direction"
-                ],
-                "name": "Mini-Roundabout"
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
             },
-            "highway/motorway": {
-                "icon": "highway-motorway",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "lanes",
-                    "surface",
-                    "ref"
-                ],
+            "craft/dressmaker": {
+                "name": "Dressmaker",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "dress",
+                    "dressmaker"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "motorway"
+                    "craft": "dressmaker"
                 },
                 },
-                "terms": [],
-                "name": "Motorway"
+                "icon": "clothing-store",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
             },
-            "highway/motorway_junction": {
+            "craft/electrician": {
+                "name": "Electrician",
                 "geometry": [
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "electrician"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "motorway_junction"
+                    "craft": "electrician"
                 },
                 },
+                "icon": "marker-stroked",
                 "fields": [
                 "fields": [
-                    "ref"
-                ],
-                "name": "Motorway Junction"
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
             },
-            "highway/motorway_link": {
-                "icon": "highway-motorway-link",
-                "fields": [
-                    "oneway_yes",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface",
-                    "ref"
-                ],
+            "craft/gardener": {
+                "name": "Gardener",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "gardener",
+                    "landscaper",
+                    "grounds keeper"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "motorway_link"
+                    "craft": "gardener"
                 },
                 },
-                "terms": [
+                "icon": "garden",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/glaziery": {
+                "name": "Glaziery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "glass",
+                    "glass foundry",
+                    "stained-glass",
+                    "window"
+                ],
+                "tags": {
+                    "craft": "glaziery"
+                },
+                "icon": "fire-station",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/handicraft": {
+                "name": "Handicraft",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "handicraft"
+                ],
+                "tags": {
+                    "craft": "handicraft"
+                },
+                "icon": "art-gallery",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/hvac": {
+                "name": "HVAC",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "heating",
+                    "ventilating",
+                    "air-conditioning",
+                    "air conditioning"
+                ],
+                "tags": {
+                    "craft": "hvac"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/insulator": {
+                "name": "Insulator",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "insulation",
+                    "insulator"
+                ],
+                "tags": {
+                    "craft": "insulation"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/jeweler": {
+                "name": "Jeweler",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "jeweler",
+                    "gem",
+                    "diamond"
+                ],
+                "tags": {
+                    "craft": "jeweler"
+                },
+                "icon": "marker-stroked",
+                "searchable": false,
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/key_cutter": {
+                "name": "Key Cutter",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "key",
+                    "key cutter"
+                ],
+                "tags": {
+                    "craft": "key_cutter"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/locksmith": {
+                "name": "Locksmith",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "locksmith",
+                    "lock"
+                ],
+                "tags": {
+                    "craft": "locksmith"
+                },
+                "icon": "marker-stroked",
+                "searchable": false,
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/metal_construction": {
+                "name": "Metal Construction",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "metal construction"
+                ],
+                "tags": {
+                    "craft": "metal_construction"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/optician": {
+                "name": "Optician",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "glasses",
+                    "optician"
+                ],
+                "tags": {
+                    "craft": "optician"
+                },
+                "icon": "marker-stroked",
+                "searchable": false,
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/painter": {
+                "name": "Painter",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "painter"
+                ],
+                "tags": {
+                    "craft": "painter"
+                },
+                "icon": "art-gallery",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/photographer": {
+                "name": "Photographer",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "photographer"
+                ],
+                "tags": {
+                    "craft": "photographer"
+                },
+                "icon": "camera",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/photographic_labratory": {
+                "name": "Photographic Labratory",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "photographic labratory",
+                    "film developer"
+                ],
+                "tags": {
+                    "craft": "photographic_labratory"
+                },
+                "icon": "camera",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/plasterer": {
+                "name": "Plasterer",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "plasterer"
+                ],
+                "tags": {
+                    "craft": "plasterer"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/plumber": {
+                "name": "Plumber",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "pumber"
+                ],
+                "tags": {
+                    "craft": "plumber"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/pottery": {
+                "name": "Pottery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "pottery",
+                    "potter"
+                ],
+                "tags": {
+                    "craft": "pottery"
+                },
+                "icon": "art-gallery",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/rigger": {
+                "name": "Rigger",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "rigger"
+                ],
+                "tags": {
+                    "craft": "rigger"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/roofer": {
+                "name": "Roofer",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "roofer"
+                ],
+                "tags": {
+                    "craft": "roofer"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/saddler": {
+                "name": "Saddler",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "saddler"
+                ],
+                "tags": {
+                    "craft": "saddler"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/sailmaker": {
+                "name": "Sailmaker",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "sailmaker"
+                ],
+                "tags": {
+                    "craft": "sailmaker"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/sawmill": {
+                "name": "Sawmill",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "sawmill",
+                    "lumber"
+                ],
+                "tags": {
+                    "craft": "sawmill"
+                },
+                "icon": "park",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/scaffolder": {
+                "name": "Scaffolder",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "scaffolder"
+                ],
+                "tags": {
+                    "craft": "scaffolder"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/sculpter": {
+                "name": "Sculpter",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "sculpter"
+                ],
+                "tags": {
+                    "craft": "sculpter"
+                },
+                "icon": "art-gallery",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/shoemaker": {
+                "name": "Shoemaker",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "shoe repair",
+                    "shoemaker"
+                ],
+                "tags": {
+                    "craft": "shoemaker"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/stonemason": {
+                "name": "Stonemason",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "stonemason",
+                    "masonry"
+                ],
+                "tags": {
+                    "craft": "stonemason"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/sweep": {
+                "name": "Chimney Sweep",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "sweep",
+                    "chimney sweep"
+                ],
+                "tags": {
+                    "craft": "sweep"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/tailor": {
+                "name": "Tailor",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "tailor",
+                    "clothes"
+                ],
+                "tags": {
+                    "craft": "tailor"
+                },
+                "icon": "clothing-store",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/tiler": {
+                "name": "Tiler",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "tiler"
+                ],
+                "tags": {
+                    "craft": "tiler"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/tinsmith": {
+                "name": "Tinsmith",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "tinsmith"
+                ],
+                "tags": {
+                    "craft": "tinsmith"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/upholsterer": {
+                "name": "Upholsterer",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "upholsterer"
+                ],
+                "tags": {
+                    "craft": "upholsterer"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/watchmaker": {
+                "name": "Watchmaker",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "watch",
+                    "watchmaker",
+                    "watch repair"
+                ],
+                "tags": {
+                    "craft": "watchmaker"
+                },
+                "icon": "circle-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/window_construction": {
+                "name": "Window Construction",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "window",
+                    "window maker",
+                    "window construction"
+                ],
+                "tags": {
+                    "craft": "window_construction"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "embankment": {
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "embankment": "yes"
+                },
+                "name": "Embankment",
+                "matchScore": 0.2
+            },
+            "emergency/ambulance_station": {
+                "fields": [
+                    "operator"
+                ],
+                "geometry": [
+                    "area",
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "emergency": "ambulance_station"
+                },
+                "name": "Ambulance Station"
+            },
+            "emergency/fire_hydrant": {
+                "fields": [
+                    "fire_hydrant/type"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "emergency": "fire_hydrant"
+                },
+                "name": "Fire Hydrant"
+            },
+            "emergency/phone": {
+                "icon": "emergency-telephone",
+                "fields": [
+                    "operator"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "emergency": "phone"
+                },
+                "name": "Emergency Phone"
+            },
+            "entrance": {
+                "icon": "entrance",
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "entrance": "*"
+                },
+                "fields": [
+                    "entrance",
+                    "access_simple",
+                    "address"
+                ],
+                "name": "Entrance"
+            },
+            "footway/crossing": {
+                "fields": [
+                    "crossing",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "footway",
+                    "footway": "crossing"
+                },
+                "terms": [
+                    "crosswalk",
+                    "zebra crossing"
+                ],
+                "name": "Crossing"
+            },
+            "footway/sidewalk": {
+                "fields": [
+                    "surface",
+                    "lit",
+                    "access"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "footway",
+                    "footway": "sidewalk"
+                },
+                "terms": [],
+                "name": "Sidewalk"
+            },
+            "golf/bunker": {
+                "icon": "golf",
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "golf": "bunker",
+                    "natural": "sand"
+                },
+                "terms": [
+                    "hazard",
+                    "bunker"
+                ],
+                "name": "Sand Trap"
+            },
+            "golf/fairway": {
+                "icon": "golf",
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "golf": "fairway",
+                    "landuse": "grass"
+                },
+                "name": "Fairway"
+            },
+            "golf/green": {
+                "icon": "golf",
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "golf": "green",
+                    "landuse": "grass",
+                    "leisure": "pitch",
+                    "sport": "golf"
+                },
+                "terms": [
+                    "putting green"
+                ],
+                "name": "Putting Green"
+            },
+            "golf/hole": {
+                "icon": "golf",
+                "fields": [
+                    "golf_hole",
+                    "par",
+                    "handicap"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "golf": "hole"
+                },
+                "name": "Golf Hole"
+            },
+            "golf/lateral_water_hazard": {
+                "icon": "golf",
+                "geometry": [
+                    "line",
+                    "area"
+                ],
+                "tags": {
+                    "golf": "lateral_water_hazard",
+                    "natural": "water"
+                },
+                "name": "Lateral Water Hazard"
+            },
+            "golf/rough": {
+                "icon": "golf",
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "golf": "rough",
+                    "landuse": "grass"
+                },
+                "name": "Rough"
+            },
+            "golf/tee": {
+                "icon": "golf",
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "golf": "tee",
+                    "landuse": "grass"
+                },
+                "terms": [
+                    "teeing ground"
+                ],
+                "name": "Tee Box"
+            },
+            "golf/water_hazard": {
+                "icon": "golf",
+                "geometry": [
+                    "line",
+                    "area"
+                ],
+                "tags": {
+                    "golf": "water_hazard",
+                    "natural": "water"
+                },
+                "name": "Water Hazard"
+            },
+            "highway": {
+                "fields": [
+                    "highway"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "line",
+                    "area"
+                ],
+                "tags": {
+                    "highway": "*"
+                },
+                "name": "Highway"
+            },
+            "highway/bridleway": {
+                "fields": [
+                    "access",
+                    "surface",
+                    "structure"
+                ],
+                "icon": "highway-bridleway",
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "bridleway"
+                },
+                "terms": [
+                    "bridleway",
+                    "equestrian trail",
+                    "horse riding path",
+                    "bridle road",
+                    "horse trail"
+                ],
+                "name": "Bridle Path"
+            },
+            "highway/bus_stop": {
+                "icon": "bus",
+                "fields": [
+                    "operator",
+                    "shelter"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "highway": "bus_stop"
+                },
+                "terms": [],
+                "name": "Bus Stop"
+            },
+            "highway/crossing": {
+                "fields": [
+                    "crossing"
+                ],
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "highway": "crossing"
+                },
+                "terms": [
+                    "crosswalk",
+                    "zebra crossing"
+                ],
+                "name": "Crossing"
+            },
+            "highway/cycleway": {
+                "icon": "highway-cycleway",
+                "fields": [
+                    "surface",
+                    "lit",
+                    "structure",
+                    "access",
+                    "oneway"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "cycleway"
+                },
+                "terms": [],
+                "name": "Cycle Path"
+            },
+            "highway/footway": {
+                "icon": "highway-footway",
+                "fields": [
+                    "structure",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line",
+                    "area"
+                ],
+                "terms": [
+                    "beaten path",
+                    "boulevard",
+                    "clearing",
+                    "course",
+                    "cut*",
+                    "drag*",
+                    "footpath",
+                    "highway",
+                    "lane",
+                    "line",
+                    "orbit",
+                    "passage",
+                    "pathway",
+                    "rail",
+                    "rails",
+                    "road",
+                    "roadway",
+                    "route",
+                    "street",
+                    "thoroughfare",
+                    "trackway",
+                    "trail",
+                    "trajectory",
+                    "walk"
+                ],
+                "tags": {
+                    "highway": "footway"
+                },
+                "name": "Foot Path"
+            },
+            "highway/living_street": {
+                "icon": "highway-living-street",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "living_street"
+                },
+                "name": "Living Street"
+            },
+            "highway/mini_roundabout": {
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "highway": "mini_roundabout"
+                },
+                "fields": [
+                    "clock_direction"
+                ],
+                "name": "Mini-Roundabout"
+            },
+            "highway/motorway": {
+                "icon": "highway-motorway",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "lanes",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "motorway"
+                },
+                "terms": [],
+                "name": "Motorway"
+            },
+            "highway/motorway_junction": {
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "highway": "motorway_junction"
+                },
+                "fields": [
+                    "ref"
+                ],
+                "name": "Motorway Junction"
+            },
+            "highway/motorway_link": {
+                "icon": "highway-motorway-link",
+                "fields": [
+                    "oneway_yes",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "motorway_link"
+                },
+                "terms": [
+                    "ramp",
+                    "on ramp",
+                    "off ramp"
+                ],
+                "name": "Motorway Link"
+            },
+            "highway/path": {
+                "icon": "highway-path",
+                "fields": [
+                    "structure",
+                    "access",
+                    "sac_scale",
+                    "surface",
+                    "incline",
+                    "trail_visibility",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "path"
+                },
+                "terms": [],
+                "name": "Path"
+            },
+            "highway/pedestrian": {
+                "fields": [
+                    "access",
+                    "oneway",
+                    "surface"
+                ],
+                "geometry": [
+                    "line",
+                    "area"
+                ],
+                "tags": {
+                    "highway": "pedestrian"
+                },
+                "terms": [],
+                "name": "Pedestrian"
+            },
+            "highway/primary": {
+                "icon": "highway-primary",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "lanes",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "primary"
+                },
+                "terms": [],
+                "name": "Primary Road"
+            },
+            "highway/primary_link": {
+                "icon": "highway-primary-link",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "primary_link"
+                },
+                "terms": [
+                    "ramp",
+                    "on ramp",
+                    "off ramp"
+                ],
+                "name": "Primary Link"
+            },
+            "highway/residential": {
+                "icon": "highway-residential",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "residential"
+                },
+                "terms": [],
+                "name": "Residential Road"
+            },
+            "highway/rest_area": {
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "highway": "rest_area"
+                },
+                "terms": [
+                    "rest stop",
+                    "turnout",
+                    "lay-by"
+                ],
+                "name": "Rest Area"
+            },
+            "highway/road": {
+                "icon": "highway-road",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "road"
+                },
+                "terms": [],
+                "name": "Unknown Road"
+            },
+            "highway/secondary": {
+                "icon": "highway-secondary",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "lanes",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "secondary"
+                },
+                "terms": [],
+                "name": "Secondary Road"
+            },
+            "highway/secondary_link": {
+                "icon": "highway-secondary-link",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "secondary_link"
+                },
+                "terms": [
+                    "ramp",
+                    "on ramp",
+                    "off ramp"
+                ],
+                "name": "Secondary Link"
+            },
+            "highway/service": {
+                "icon": "highway-service",
+                "fields": [
+                    "service",
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "service"
+                },
+                "terms": [],
+                "name": "Service Road"
+            },
+            "highway/service/alley": {
+                "icon": "highway-service",
+                "fields": [
+                    "oneway",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "service",
+                    "service": "alley"
+                },
+                "name": "Alley"
+            },
+            "highway/service/drive-through": {
+                "icon": "highway-service",
+                "fields": [
+                    "oneway",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "service",
+                    "service": "drive-through"
+                },
+                "name": "Drive-Through"
+            },
+            "highway/service/driveway": {
+                "icon": "highway-service",
+                "fields": [
+                    "oneway",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "service",
+                    "service": "driveway"
+                },
+                "name": "Driveway"
+            },
+            "highway/service/emergency_access": {
+                "icon": "highway-service",
+                "fields": [
+                    "oneway",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "service",
+                    "service": "emergency_access"
+                },
+                "name": "Emergency Access"
+            },
+            "highway/service/parking_aisle": {
+                "icon": "highway-service",
+                "fields": [
+                    "oneway",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "service",
+                    "service": "parking_aisle"
+                },
+                "name": "Parking Aisle"
+            },
+            "highway/services": {
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "highway": "services"
+                },
+                "terms": [
+                    "services",
+                    "travel plaza",
+                    "service station"
+                ],
+                "name": "Service Area"
+            },
+            "highway/steps": {
+                "fields": [
+                    "access",
+                    "surface"
+                ],
+                "icon": "highway-steps",
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "steps"
+                },
+                "terms": [
+                    "stairs",
+                    "staircase"
+                ],
+                "name": "Steps"
+            },
+            "highway/stop": {
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "highway": "stop"
+                },
+                "terms": [
+                    "stop sign"
+                ],
+                "name": "Stop Sign"
+            },
+            "highway/tertiary": {
+                "icon": "highway-tertiary",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "lanes",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "tertiary"
+                },
+                "terms": [],
+                "name": "Tertiary Road"
+            },
+            "highway/tertiary_link": {
+                "icon": "highway-tertiary-link",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "tertiary_link"
+                },
+                "terms": [
+                    "ramp",
+                    "on ramp",
+                    "off ramp"
+                ],
+                "name": "Tertiary Link"
+            },
+            "highway/track": {
+                "icon": "highway-track",
+                "fields": [
+                    "tracktype",
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "track"
+                },
+                "terms": [],
+                "name": "Track"
+            },
+            "highway/traffic_signals": {
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "highway": "traffic_signals"
+                },
+                "terms": [
+                    "light",
+                    "stoplight",
+                    "traffic light"
+                ],
+                "name": "Traffic Signals"
+            },
+            "highway/trunk": {
+                "icon": "highway-trunk",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "lanes",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "trunk"
+                },
+                "terms": [],
+                "name": "Trunk Road"
+            },
+            "highway/trunk_link": {
+                "icon": "highway-trunk-link",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "trunk_link"
+                },
+                "terms": [
                     "ramp",
                     "on ramp",
                     "off ramp"
                 ],
                     "ramp",
                     "on ramp",
                     "off ramp"
                 ],
-                "name": "Motorway Link"
+                "name": "Trunk Link"
+            },
+            "highway/turning_circle": {
+                "icon": "circle",
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "highway": "turning_circle"
+                },
+                "terms": [],
+                "name": "Turning Circle"
+            },
+            "highway/unclassified": {
+                "icon": "highway-unclassified",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "unclassified"
+                },
+                "terms": [],
+                "name": "Unclassified Road"
+            },
+            "historic": {
+                "fields": [
+                    "historic"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "historic": "*"
+                },
+                "name": "Historic Site"
+            },
+            "historic/archaeological_site": {
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "historic": "archaeological_site"
+                },
+                "name": "Archaeological Site"
+            },
+            "historic/boundary_stone": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "historic": "boundary_stone"
+                },
+                "name": "Boundary Stone"
+            },
+            "historic/castle": {
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "historic": "castle"
+                },
+                "name": "Castle"
+            },
+            "historic/memorial": {
+                "icon": "monument",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "historic": "memorial"
+                },
+                "name": "Memorial"
+            },
+            "historic/monument": {
+                "icon": "monument",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "historic": "monument"
+                },
+                "name": "Monument"
+            },
+            "historic/ruins": {
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "historic": "ruins"
+                },
+                "name": "Ruins"
+            },
+            "historic/wayside_cross": {
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "historic": "wayside_cross"
+                },
+                "name": "Wayside Cross"
+            },
+            "historic/wayside_shrine": {
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "historic": "wayside_shrine"
+                },
+                "name": "Wayside Shrine"
+            },
+            "landuse": {
+                "fields": [
+                    "landuse"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "*"
+                },
+                "name": "Landuse"
+            },
+            "landuse/allotments": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "allotments"
+                },
+                "terms": [],
+                "name": "Allotments"
+            },
+            "landuse/basin": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "basin"
+                },
+                "terms": [],
+                "name": "Basin"
             },
             },
-            "highway/path": {
-                "icon": "highway-path",
+            "landuse/cemetery": {
+                "icon": "cemetery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "cemetery"
+                },
+                "terms": [],
+                "name": "Cemetery"
+            },
+            "landuse/commercial": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "commercial"
+                },
+                "terms": [],
+                "name": "Commercial"
+            },
+            "landuse/construction": {
                 "fields": [
                 "fields": [
-                    "structure",
-                    "access",
-                    "sac_scale",
-                    "surface",
-                    "incline",
-                    "trail_visibility",
-                    "ref"
+                    "construction",
+                    "operator"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "path"
+                    "landuse": "construction"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Path"
+                "name": "Construction"
             },
             },
-            "highway/pedestrian": {
+            "landuse/farm": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "farm"
+                },
+                "terms": [],
+                "name": "Farm",
+                "icon": "farm"
+            },
+            "landuse/farmland": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "farmland"
+                },
+                "terms": [],
+                "name": "Farmland",
+                "icon": "farm",
+                "searchable": false
+            },
+            "landuse/farmyard": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "farmyard"
+                },
+                "terms": [],
+                "name": "Farmyard",
+                "icon": "farm"
+            },
+            "landuse/forest": {
                 "fields": [
                 "fields": [
-                    "access",
-                    "oneway",
-                    "surface"
+                    "wood"
+                ],
+                "icon": "park2",
+                "geometry": [
+                    "point",
+                    "area"
                 ],
                 ],
+                "tags": {
+                    "landuse": "forest"
+                },
+                "terms": [],
+                "name": "Forest"
+            },
+            "landuse/grass": {
                 "geometry": [
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "highway": "pedestrian"
+                    "landuse": "grass"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Pedestrian"
+                "name": "Grass"
             },
             },
-            "highway/primary": {
-                "icon": "highway-primary",
+            "landuse/industrial": {
+                "icon": "industrial",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "industrial"
+                },
+                "terms": [],
+                "name": "Industrial"
+            },
+            "landuse/meadow": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "meadow"
+                },
+                "terms": [],
+                "name": "Meadow"
+            },
+            "landuse/orchard": {
+                "icon": "park2",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "orchard"
+                },
+                "terms": [],
+                "name": "Orchard"
+            },
+            "landuse/quarry": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "quarry"
+                },
+                "terms": [],
+                "name": "Quarry"
+            },
+            "landuse/residential": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "residential"
+                },
+                "terms": [],
+                "name": "Residential"
+            },
+            "landuse/retail": {
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "retail"
+                },
+                "name": "Retail"
+            },
+            "landuse/vineyard": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "vineyard"
+                },
+                "terms": [],
+                "name": "Vineyard"
+            },
+            "leisure": {
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "lanes",
-                    "surface",
-                    "ref"
+                    "leisure"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "primary"
+                    "leisure": "*"
+                },
+                "name": "Leisure"
+            },
+            "leisure/common": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "open space"
+                ],
+                "tags": {
+                    "leisure": "common"
                 },
                 },
+                "name": "Common"
+            },
+            "leisure/dog_park": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
                 "terms": [],
                 "terms": [],
-                "name": "Primary Road"
+                "tags": {
+                    "leisure": "dog_park"
+                },
+                "name": "Dog Park",
+                "icon": "dog-park"
             },
             },
-            "highway/primary_link": {
-                "icon": "highway-primary-link",
+            "leisure/garden": {
+                "icon": "garden",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "leisure": "garden"
+                },
+                "name": "Garden"
+            },
+            "leisure/golf_course": {
+                "icon": "golf",
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface",
-                    "ref"
+                    "operator",
+                    "address"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "primary_link"
+                    "leisure": "golf_course"
                 },
                 "terms": [
                 },
                 "terms": [
-                    "ramp",
-                    "on ramp",
-                    "off ramp"
+                    "links"
                 ],
                 ],
-                "name": "Primary Link"
+                "name": "Golf Course"
             },
             },
-            "highway/residential": {
-                "icon": "highway-residential",
+            "leisure/marina": {
+                "icon": "harbor",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "leisure": "marina"
+                },
+                "name": "Marina"
+            },
+            "leisure/park": {
+                "icon": "park",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "esplanade",
+                    "estate",
+                    "forest",
+                    "garden",
+                    "grass",
+                    "green",
+                    "grounds",
+                    "lawn",
+                    "lot",
+                    "meadow",
+                    "parkland",
+                    "place",
+                    "playground",
+                    "plaza",
+                    "pleasure garden",
+                    "recreation area",
+                    "square",
+                    "tract",
+                    "village green",
+                    "woodland"
+                ],
+                "tags": {
+                    "leisure": "park"
+                },
+                "name": "Park"
+            },
+            "leisure/pitch": {
+                "icon": "pitch",
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
+                    "sport",
                     "surface"
                 ],
                 "geometry": [
                     "surface"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "residential"
+                    "leisure": "pitch"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Residential Road"
+                "name": "Sport Pitch"
             },
             },
-            "highway/road": {
-                "icon": "highway-road",
+            "leisure/pitch/american_football": {
+                "icon": "america-football",
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
                     "surface"
                 ],
                 "geometry": [
                     "surface"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "road"
+                    "leisure": "pitch",
+                    "sport": "american_football"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Unknown Road"
+                "name": "American Football Field"
             },
             },
-            "highway/secondary": {
-                "icon": "highway-secondary",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "lanes",
-                    "surface",
-                    "ref"
-                ],
+            "leisure/pitch/baseball": {
+                "icon": "baseball",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "secondary"
+                    "leisure": "pitch",
+                    "sport": "baseball"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Secondary Road"
+                "name": "Baseball Diamond"
             },
             },
-            "highway/secondary_link": {
-                "icon": "highway-secondary-link",
+            "leisure/pitch/basketball": {
+                "icon": "basketball",
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface",
-                    "ref"
+                    "surface"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "secondary_link"
+                    "leisure": "pitch",
+                    "sport": "basketball"
                 },
                 },
-                "terms": [
-                    "ramp",
-                    "on ramp",
-                    "off ramp"
-                ],
-                "name": "Secondary Link"
+                "terms": [],
+                "name": "Basketball Court"
             },
             },
-            "highway/service": {
-                "icon": "highway-service",
+            "leisure/pitch/skateboard": {
+                "icon": "pitch",
                 "fields": [
                 "fields": [
-                    "service",
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
                     "surface"
                 ],
                 "geometry": [
                     "surface"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "service"
+                    "leisure": "pitch",
+                    "sport": "skateboard"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Service Road"
+                "name": "Skate Park"
             },
             },
-            "highway/service/alley": {
-                "icon": "highway-service",
+            "leisure/pitch/soccer": {
+                "icon": "soccer",
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "access",
                     "surface"
                 ],
                 "geometry": [
                     "surface"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "service",
-                    "service": "alley"
+                    "leisure": "pitch",
+                    "sport": "soccer"
                 },
                 },
-                "name": "Alley"
+                "terms": [],
+                "name": "Soccer Field"
             },
             },
-            "highway/service/drive-through": {
-                "icon": "highway-service",
+            "leisure/pitch/tennis": {
+                "icon": "tennis",
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "access",
                     "surface"
                 ],
                 "geometry": [
                     "surface"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "service",
-                    "service": "drive-through"
+                    "leisure": "pitch",
+                    "sport": "tennis"
                 },
                 },
-                "name": "Drive-Through"
+                "terms": [],
+                "name": "Tennis Court"
             },
             },
-            "highway/service/driveway": {
-                "icon": "highway-service",
+            "leisure/pitch/volleyball": {
+                "icon": "pitch",
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "access",
                     "surface"
                 ],
                 "geometry": [
                     "surface"
                 ],
                 "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "leisure": "pitch",
+                    "sport": "volleyball"
+                },
+                "terms": [],
+                "name": "Volleyball Court"
+            },
+            "leisure/playground": {
+                "icon": "playground",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "leisure": "playground"
+                },
+                "name": "Playground",
+                "terms": [
+                    "jungle gym",
+                    "play area"
+                ]
+            },
+            "leisure/slipway": {
+                "geometry": [
+                    "point",
                     "line"
                 ],
                 "tags": {
                     "line"
                 ],
                 "tags": {
-                    "highway": "service",
-                    "service": "driveway"
+                    "leisure": "slipway"
                 },
                 },
-                "name": "Driveway"
+                "name": "Slipway"
             },
             },
-            "highway/service/emergency_access": {
-                "icon": "highway-service",
+            "leisure/sports_center": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "leisure": "sports_centre"
+                },
+                "terms": [
+                    "gym"
+                ],
+                "icon": "sports",
+                "name": "Sports Center"
+            },
+            "leisure/stadium": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "leisure": "stadium"
+                },
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "access",
-                    "surface"
+                    "sport"
+                ],
+                "name": "Stadium"
+            },
+            "leisure/swimming_pool": {
+                "fields": [
+                    "access_simple"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "service",
-                    "service": "emergency_access"
+                    "leisure": "swimming_pool"
                 },
                 },
-                "name": "Emergency Access"
+                "icon": "swimming",
+                "name": "Swimming Pool"
             },
             },
-            "highway/service/parking_aisle": {
-                "icon": "highway-service",
+            "leisure/track": {
+                "icon": "pitch",
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "access",
                     "surface"
                 ],
                 "geometry": [
                     "surface"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "line",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "service",
-                    "service": "parking_aisle"
+                    "leisure": "track"
                 },
                 },
-                "name": "Parking Aisle"
+                "name": "Race Track"
             },
             },
-            "highway/steps": {
+            "line": {
+                "name": "Line",
+                "tags": {},
+                "geometry": [
+                    "line"
+                ],
+                "matchScore": 0.1
+            },
+            "man_made": {
                 "fields": [
                 "fields": [
-                    "access",
-                    "surface"
+                    "man_made"
                 ],
                 ],
-                "icon": "highway-steps",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "line",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "steps"
+                    "man_made": "*"
                 },
                 },
-                "terms": [
-                    "stairs",
-                    "staircase"
-                ],
-                "name": "Steps"
+                "name": "Man Made"
             },
             },
-            "highway/stop": {
+            "man_made/breakwater": {
                 "geometry": [
                 "geometry": [
-                    "vertex"
+                    "line",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "stop"
+                    "man_made": "breakwater"
                 },
                 },
-                "terms": [
-                    "stop sign"
-                ],
-                "name": "Stop Sign"
+                "name": "Breakwater"
             },
             },
-            "highway/tertiary": {
-                "icon": "highway-tertiary",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "lanes",
-                    "surface",
-                    "ref"
-                ],
+            "man_made/cutline": {
                 "geometry": [
                     "line"
                 ],
                 "tags": {
                 "geometry": [
                     "line"
                 ],
                 "tags": {
-                    "highway": "tertiary"
+                    "man_made": "cutline"
                 },
                 },
-                "terms": [],
-                "name": "Tertiary Road"
+                "name": "Cut line"
             },
             },
-            "highway/tertiary_link": {
-                "icon": "highway-tertiary-link",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface",
-                    "ref"
-                ],
+            "man_made/embankment": {
                 "geometry": [
                     "line"
                 ],
                 "tags": {
                 "geometry": [
                     "line"
                 ],
                 "tags": {
-                    "highway": "tertiary_link"
+                    "man_made": "embankment"
                 },
                 },
-                "terms": [
-                    "ramp",
-                    "on ramp",
-                    "off ramp"
-                ],
-                "name": "Tertiary Link"
+                "name": "Embankment",
+                "searchable": false
             },
             },
-            "highway/track": {
-                "icon": "highway-track",
-                "fields": [
-                    "tracktype",
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface"
-                ],
+            "man_made/flagpole": {
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "track"
+                    "man_made": "flagpole"
                 },
                 },
-                "terms": [],
-                "name": "Track"
+                "name": "Flagpole",
+                "icon": "embassy"
             },
             },
-            "highway/traffic_signals": {
+            "man_made/lighthouse": {
                 "geometry": [
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "traffic_signals"
+                    "man_made": "lighthouse"
                 },
                 },
-                "terms": [
-                    "light",
-                    "stoplight",
-                    "traffic light"
-                ],
-                "name": "Traffic Signals"
+                "name": "Lighthouse",
+                "icon": "lighthouse"
             },
             },
-            "highway/trunk": {
-                "icon": "highway-trunk",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "lanes",
-                    "surface",
-                    "ref"
-                ],
+            "man_made/observation": {
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "lookout tower",
+                    "fire tower"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "trunk"
+                    "man_made": "tower",
+                    "tower:type": "observation"
                 },
                 },
-                "terms": [],
-                "name": "Trunk Road"
+                "name": "Observation Tower"
             },
             },
-            "highway/trunk_link": {
-                "icon": "highway-trunk-link",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface",
-                    "ref"
-                ],
+            "man_made/pier": {
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "line",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "trunk_link"
+                    "man_made": "pier"
                 },
                 },
-                "terms": [
-                    "ramp",
-                    "on ramp",
-                    "off ramp"
-                ],
-                "name": "Trunk Link"
+                "name": "Pier"
             },
             },
-            "highway/turning_circle": {
-                "icon": "circle",
+            "man_made/pipeline": {
                 "geometry": [
                 "geometry": [
-                    "vertex"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "turning_circle"
+                    "man_made": "pipeline"
                 },
                 },
-                "terms": [],
-                "name": "Turning Circle"
-            },
-            "highway/unclassified": {
-                "icon": "highway-unclassified",
                 "fields": [
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface"
+                    "location",
+                    "operator"
                 ],
                 ],
+                "name": "Pipeline",
+                "icon": "pipeline"
+            },
+            "man_made/survey_point": {
+                "icon": "monument",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "highway": "unclassified"
+                    "man_made": "survey_point"
                 },
                 },
-                "terms": [],
-                "name": "Unclassified Road"
-            },
-            "historic": {
                 "fields": [
                 "fields": [
-                    "historic"
+                    "ref"
                 ],
                 ],
+                "name": "Survey Point"
+            },
+            "man_made/tower": {
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "historic": "*"
+                    "man_made": "tower"
                 },
                 },
-                "name": "Historic Site"
+                "fields": [
+                    "towertype"
+                ],
+                "name": "Tower"
             },
             },
-            "historic/archaeological_site": {
+            "man_made/wastewater_plant": {
+                "icon": "water",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "historic": "archaeological_site"
+                    "man_made": "wastewater_plant"
                 },
                 },
-                "name": "Archaeological Site"
+                "name": "Wastewater Plant",
+                "terms": [
+                    "sewage works",
+                    "sewage treatment plant",
+                    "water treatment plant",
+                    "reclamation plant"
+                ]
             },
             },
-            "historic/boundary_stone": {
+            "man_made/water_tower": {
+                "icon": "water",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "historic": "boundary_stone"
+                    "man_made": "water_tower"
                 },
                 },
-                "name": "Boundary Stone"
+                "name": "Water Tower"
             },
             },
-            "historic/castle": {
+            "man_made/water_well": {
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "historic": "castle"
+                    "man_made": "water_well"
                 },
                 },
-                "name": "Castle"
+                "name": "Water well"
             },
             },
-            "historic/memorial": {
-                "icon": "monument",
+            "man_made/water_works": {
+                "icon": "water",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "historic": "memorial"
+                    "man_made": "water_works"
                 },
                 },
-                "name": "Memorial"
+                "name": "Water Works"
             },
             },
-            "historic/monument": {
-                "icon": "monument",
+            "military/airfield": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "historic": "monument"
+                    "military": "airfield"
                 },
                 },
-                "name": "Monument"
+                "terms": [],
+                "name": "Airfield",
+                "icon": "airfield"
             },
             },
-            "historic/ruins": {
+            "military/barracks": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "historic": "ruins"
+                    "military": "barracks"
                 },
                 },
-                "name": "Ruins"
+                "terms": [],
+                "name": "Barracks"
             },
             },
-            "historic/wayside_cross": {
+            "military/bunker": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "historic": "wayside_cross"
+                    "military": "bunker"
                 },
                 },
-                "name": "Wayside Cross"
+                "terms": [],
+                "name": "Bunker"
             },
             },
-            "historic/wayside_shrine": {
+            "military/range": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "historic": "wayside_shrine"
+                    "military": "range"
                 },
                 },
-                "name": "Wayside Shrine"
+                "terms": [],
+                "name": "Military Range"
             },
             },
-            "landuse": {
+            "natural": {
                 "fields": [
                 "fields": [
-                    "landuse"
+                    "natural"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -63794,215 +67115,273 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "landuse": "*"
+                    "natural": "*"
                 },
                 },
-                "name": "Landuse"
+                "name": "Natural"
             },
             },
-            "landuse/allotments": {
+            "natural/bay": {
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "landuse": "allotments"
+                    "natural": "bay"
                 },
                 },
-                "terms": [],
-                "name": "Allotments"
+                "name": "Bay"
             },
             },
-            "landuse/basin": {
+            "natural/beach": {
+                "fields": [
+                    "surface"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "landuse": "basin"
+                    "natural": "beach"
                 },
                 },
-                "terms": [],
-                "name": "Basin"
+                "name": "Beach"
             },
             },
-            "landuse/cemetery": {
-                "icon": "cemetery",
+            "natural/cliff": {
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
+                    "line",
                     "area"
                 ],
                     "area"
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "landuse": "cemetery"
+                    "natural": "cliff"
                 },
                 },
-                "terms": [],
-                "name": "Cemetery"
+                "name": "Cliff"
             },
             },
-            "landuse/commercial": {
+            "natural/coastline": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "area"
+                    "line"
+                ],
+                "terms": [
+                    "shore"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "landuse": "commercial"
+                    "natural": "coastline"
                 },
                 },
-                "terms": [],
-                "name": "Commercial"
+                "name": "Coastline"
             },
             },
-            "landuse/construction": {
-                "fields": [
-                    "construction",
-                    "operator"
-                ],
+            "natural/fell": {
                 "geometry": [
                 "geometry": [
-                    "point",
                     "area"
                 ],
                     "area"
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "landuse": "construction"
+                    "natural": "fell"
                 },
                 },
-                "terms": [],
-                "name": "Construction"
+                "name": "Fell"
             },
             },
-            "landuse/farm": {
+            "natural/glacier": {
                 "geometry": [
                 "geometry": [
-                    "point",
                     "area"
                 ],
                     "area"
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "landuse": "farm"
+                    "natural": "glacier"
                 },
                 },
-                "terms": [],
-                "name": "Farm",
-                "icon": "farm"
+                "name": "Glacier"
             },
             },
-            "landuse/farmland": {
+            "natural/grassland": {
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "landuse": "farmland"
+                    "natural": "grassland"
                 },
                 },
-                "terms": [],
-                "name": "Farmland",
-                "icon": "farm",
-                "searchable": false
+                "name": "Grassland"
             },
             },
-            "landuse/farmyard": {
+            "natural/heath": {
                 "geometry": [
                 "geometry": [
-                    "point",
                     "area"
                 ],
                     "area"
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "landuse": "farmyard"
+                    "natural": "heath"
                 },
                 },
-                "terms": [],
-                "name": "Farmyard",
-                "icon": "farm"
+                "name": "Heath"
             },
             },
-            "landuse/forest": {
+            "natural/peak": {
+                "icon": "triangle",
                 "fields": [
                 "fields": [
-                    "wood"
+                    "elevation"
                 ],
                 ],
-                "icon": "park2",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "natural": "peak"
+                },
+                "terms": [
+                    "acme",
+                    "aiguille",
+                    "alp",
+                    "climax",
+                    "crest",
+                    "crown",
+                    "hill",
+                    "mount",
+                    "mountain",
+                    "pinnacle",
+                    "summit",
+                    "tip",
+                    "top"
+                ],
+                "name": "Peak"
+            },
+            "natural/scree": {
+                "geometry": [
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "landuse": "forest"
+                    "natural": "scree"
                 },
                 },
-                "terms": [],
-                "name": "Forest"
+                "terms": [
+                    "loose rocks"
+                ],
+                "name": "Scree"
             },
             },
-            "landuse/grass": {
+            "natural/scrub": {
                 "geometry": [
                 "geometry": [
-                    "point",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "landuse": "grass"
+                    "natural": "scrub"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Grass"
+                "name": "Scrub"
             },
             },
-            "landuse/industrial": {
-                "icon": "industrial",
+            "natural/spring": {
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "area"
+                    "vertex"
                 ],
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "landuse": "industrial"
+                    "natural": "spring"
                 },
                 },
-                "terms": [],
-                "name": "Industrial"
+                "name": "Spring"
             },
             },
-            "landuse/meadow": {
+            "natural/tree": {
+                "fields": [
+                    "tree_type",
+                    "denotation"
+                ],
+                "icon": "park",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex"
+                ],
+                "terms": [],
+                "tags": {
+                    "natural": "tree"
+                },
+                "name": "Tree"
+            },
+            "natural/water": {
+                "fields": [
+                    "water"
+                ],
+                "geometry": [
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "landuse": "meadow"
+                    "natural": "water"
                 },
                 },
-                "terms": [],
-                "name": "Meadow"
+                "icon": "water",
+                "name": "Water"
             },
             },
-            "landuse/orchard": {
-                "icon": "park2",
+            "natural/water/lake": {
                 "geometry": [
                 "geometry": [
-                    "point",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "landuse": "orchard"
+                    "natural": "water",
+                    "water": "lake"
                 },
                 },
-                "terms": [],
-                "name": "Orchard"
+                "terms": [
+                    "lakelet",
+                    "loch",
+                    "mere"
+                ],
+                "icon": "water",
+                "name": "Lake"
+            },
+            "natural/water/pond": {
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "natural": "water",
+                    "water": "pond"
+                },
+                "terms": [
+                    "lakelet",
+                    "millpond",
+                    "tarn",
+                    "pool",
+                    "mere"
+                ],
+                "icon": "water",
+                "name": "Pond"
             },
             },
-            "landuse/quarry": {
+            "natural/water/reservoir": {
                 "geometry": [
                 "geometry": [
-                    "point",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "landuse": "quarry"
+                    "natural": "water",
+                    "water": "reservoir"
                 },
                 },
-                "terms": [],
-                "name": "Quarry"
+                "icon": "water",
+                "name": "Reservoir"
             },
             },
-            "landuse/residential": {
+            "natural/wetland": {
+                "icon": "wetland",
+                "fields": [
+                    "wetland"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "landuse": "residential"
+                    "natural": "wetland"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Residential"
+                "name": "Wetland"
             },
             },
-            "landuse/retail": {
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "area"
+            "natural/wood": {
+                "fields": [
+                    "wood"
                 ],
                 ],
-                "tags": {
-                    "landuse": "retail"
-                },
-                "name": "Retail"
-            },
-            "landuse/vineyard": {
+                "icon": "park2",
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "landuse": "vineyard"
+                    "natural": "wood"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Vineyard"
+                "name": "Wood"
             },
             },
-            "leisure": {
+            "office": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "leisure"
+                    "office",
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -64010,290 +67389,305 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "*"
+                    "office": "*"
                 },
                 },
-                "name": "Leisure"
+                "terms": [],
+                "name": "Office"
             },
             },
-            "leisure/common": {
+            "office/accountant": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                     "area"
                 ],
-                "terms": [
-                    "open space"
-                ],
                 "tags": {
                 "tags": {
-                    "leisure": "common"
+                    "office": "accountant"
                 },
                 },
-                "name": "Common"
+                "terms": [],
+                "name": "Accountant"
             },
             },
-            "leisure/dog_park": {
+            "office/administrative": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                     "area"
                 ],
-                "terms": [],
                 "tags": {
                 "tags": {
-                    "leisure": "dog_park"
+                    "office": "administrative"
                 },
                 },
-                "name": "Dog Park",
-                "icon": "dog-park"
+                "terms": [],
+                "name": "Administrative Office"
             },
             },
-            "leisure/garden": {
-                "icon": "garden",
+            "office/architect": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "garden"
+                    "office": "architect"
                 },
                 },
-                "name": "Garden"
+                "terms": [],
+                "name": "Architect"
             },
             },
-            "leisure/golf_course": {
-                "icon": "golf",
+            "office/company": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "operator",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "golf_course"
+                    "office": "company"
                 },
                 },
-                "terms": [
-                    "links"
-                ],
-                "name": "Golf Course"
+                "terms": [],
+                "name": "Company Office"
             },
             },
-            "leisure/marina": {
-                "icon": "harbor",
+            "office/educational_institution": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "marina"
+                    "office": "educational_institution"
                 },
                 },
-                "name": "Marina"
+                "terms": [],
+                "name": "Educational Institution"
             },
             },
-            "leisure/park": {
-                "icon": "park",
+            "office/employment_agency": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                     "area"
                 ],
-                "terms": [
-                    "esplanade",
-                    "estate",
-                    "forest",
-                    "garden",
-                    "grass",
-                    "green",
-                    "grounds",
-                    "lawn",
-                    "lot",
-                    "meadow",
-                    "parkland",
-                    "place",
-                    "playground",
-                    "plaza",
-                    "pleasure garden",
-                    "recreation area",
-                    "square",
-                    "tract",
-                    "village green",
-                    "woodland"
-                ],
                 "tags": {
                 "tags": {
-                    "leisure": "park"
+                    "office": "employment_agency"
                 },
                 },
-                "name": "Park"
+                "terms": [],
+                "name": "Employment Agency"
             },
             },
-            "leisure/pitch": {
-                "icon": "pitch",
+            "office/estate_agent": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "sport",
-                    "surface"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch"
+                    "office": "estate_agent"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Sport Pitch"
+                "name": "Real Estate Office"
             },
             },
-            "leisure/pitch/american_football": {
-                "icon": "america-football",
+            "office/financial": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "surface"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "american_football"
+                    "office": "financial"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "American Football Field"
+                "name": "Financial Office"
             },
             },
-            "leisure/pitch/baseball": {
-                "icon": "baseball",
+            "office/government": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "baseball"
+                    "office": "government"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Baseball Diamond"
+                "name": "Government Office"
             },
             },
-            "leisure/pitch/basketball": {
-                "icon": "basketball",
+            "office/insurance": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "surface"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "basketball"
+                    "office": "insurance"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Basketball Court"
+                "name": "Insurance Office"
             },
             },
-            "leisure/pitch/skateboard": {
-                "icon": "pitch",
+            "office/it": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "surface"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "skateboard"
+                    "office": "it"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Skate Park"
+                "name": "IT Office"
             },
             },
-            "leisure/pitch/soccer": {
-                "icon": "soccer",
+            "office/lawyer": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "surface"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "soccer"
+                    "office": "lawyer"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Soccer Field"
+                "name": "Law Office"
             },
             },
-            "leisure/pitch/tennis": {
-                "icon": "tennis",
+            "office/newspaper": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "surface"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "tennis"
+                    "office": "newspaper"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Tennis Court"
+                "name": "Newspaper"
             },
             },
-            "leisure/pitch/volleyball": {
-                "icon": "pitch",
+            "office/ngo": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "surface"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "volleyball"
+                    "office": "ngo"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Volleyball Court"
+                "name": "NGO Office"
             },
             },
-            "leisure/playground": {
-                "icon": "playground",
+            "office/physician": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "playground"
+                    "office": "physician"
                 },
                 },
-                "name": "Playground",
-                "terms": [
-                    "jungle gym",
-                    "play area"
-                ]
+                "terms": [],
+                "name": "Physician"
             },
             },
-            "leisure/slipway": {
-                "geometry": [
-                    "point",
-                    "line"
+            "office/political_party": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "opening_hours"
                 ],
                 ],
-                "tags": {
-                    "leisure": "slipway"
-                },
-                "name": "Slipway"
-            },
-            "leisure/sports_center": {
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "sports_centre"
+                    "office": "political_party"
                 },
                 },
-                "terms": [
-                    "gym"
-                ],
-                "icon": "sports",
-                "name": "Sports Center"
+                "terms": [],
+                "name": "Political Party"
             },
             },
-            "leisure/stadium": {
+            "office/research": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "stadium"
+                    "office": "research"
                 },
                 },
-                "fields": [
-                    "sport"
-                ],
-                "name": "Stadium"
+                "terms": [],
+                "name": "Research Office"
             },
             },
-            "leisure/swimming_pool": {
+            "office/telecommunication": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "access_simple"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -64301,539 +67695,577 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "swimming_pool"
+                    "office": "telecommunication"
                 },
                 },
-                "icon": "swimming",
-                "name": "Swimming Pool"
+                "terms": [],
+                "name": "Telecom Office"
             },
             },
-            "leisure/track": {
-                "icon": "pitch",
+            "office/therapist": {
+                "icon": "commercial",
                 "fields": [
                 "fields": [
-                    "surface"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
-                    "line",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "leisure": "track"
+                    "office": "therapist"
                 },
                 },
-                "name": "Race Track"
-            },
-            "line": {
-                "name": "Line",
-                "tags": {},
-                "geometry": [
-                    "line"
-                ],
-                "matchScore": 0.1
+                "terms": [],
+                "name": "Therapist"
             },
             },
-            "man_made": {
+            "office/travel_agent": {
+                "icon": "suitcase",
                 "fields": [
                 "fields": [
-                    "man_made"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                 ],
                 "geometry": [
                     "point",
                     "vertex",
-                    "line",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "man_made": "*"
+                    "office": "travel_agent"
                 },
                 },
-                "name": "Man Made"
+                "terms": [],
+                "name": "Travel Agency",
+                "searchable": false
             },
             },
-            "man_made/breakwater": {
+            "piste": {
+                "icon": "skiing",
+                "fields": [
+                    "piste/type",
+                    "piste/difficulty",
+                    "piste/grooming",
+                    "oneway",
+                    "lit"
+                ],
                 "geometry": [
                 "geometry": [
+                    "point",
                     "line",
                     "area"
                 ],
                     "line",
                     "area"
                 ],
-                "tags": {
-                    "man_made": "breakwater"
-                },
-                "name": "Breakwater"
-            },
-            "man_made/cutline": {
-                "geometry": [
-                    "line"
+                "terms": [
+                    "ski",
+                    "sled",
+                    "sleigh",
+                    "snowboard",
+                    "nordic",
+                    "downhill",
+                    "snowmobile"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "man_made": "cutline"
+                    "piste:type": "*"
                 },
                 },
-                "name": "Cut line"
+                "name": "Piste/Ski Trail"
             },
             },
-            "man_made/embankment": {
+            "place": {
+                "fields": [
+                    "place"
+                ],
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "man_made": "embankment"
+                    "place": "*"
                 },
                 },
-                "name": "Embankment",
-                "searchable": false
+                "name": "Place"
             },
             },
-            "man_made/flagpole": {
+            "place/city": {
+                "icon": "city",
                 "geometry": [
                 "geometry": [
-                    "point"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "man_made": "flagpole"
+                    "place": "city"
                 },
                 },
-                "name": "Flagpole",
-                "icon": "embassy"
+                "name": "City"
             },
             },
-            "man_made/lighthouse": {
+            "place/hamlet": {
+                "icon": "triangle-stroked",
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "man_made": "lighthouse"
+                    "place": "hamlet"
                 },
                 },
-                "name": "Lighthouse",
-                "icon": "lighthouse"
+                "name": "Hamlet"
             },
             },
-            "man_made/observation": {
+            "place/island": {
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "terms": [
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "terms": [
-                    "lookout tower",
-                    "fire tower"
+                    "archipelago",
+                    "atoll",
+                    "bar",
+                    "cay",
+                    "isle",
+                    "islet",
+                    "key",
+                    "reef"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "man_made": "tower",
-                    "tower:type": "observation"
+                    "place": "island"
                 },
                 },
-                "name": "Observation Tower"
+                "name": "Island"
             },
             },
-            "man_made/pier": {
+            "place/isolated_dwelling": {
                 "geometry": [
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "man_made": "pier"
+                    "place": "isolated_dwelling"
                 },
                 },
-                "name": "Pier"
+                "name": "Isolated Dwelling"
             },
             },
-            "man_made/pipeline": {
+            "place/locality": {
+                "icon": "marker",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "man_made": "pipeline"
+                    "place": "locality"
                 },
                 },
-                "fields": [
-                    "location",
-                    "operator"
-                ],
-                "name": "Pipeline",
-                "icon": "pipeline"
+                "name": "Locality"
             },
             },
-            "man_made/survey_point": {
-                "icon": "monument",
+            "place/town": {
+                "icon": "town",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "man_made": "survey_point"
+                    "place": "town"
                 },
                 },
-                "fields": [
-                    "ref"
-                ],
-                "name": "Survey Point"
+                "name": "Town"
             },
             },
-            "man_made/tower": {
+            "place/village": {
+                "icon": "village",
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "man_made": "tower"
+                    "place": "village"
                 },
                 },
-                "fields": [
-                    "towertype"
+                "name": "Village"
+            },
+            "point": {
+                "name": "Point",
+                "tags": {},
+                "geometry": [
+                    "point"
                 ],
                 ],
-                "name": "Tower"
+                "matchScore": 0.1
             },
             },
-            "man_made/wastewater_plant": {
-                "icon": "water",
+            "power": {
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "man_made": "wastewater_plant"
+                    "power": "*"
                 },
                 },
-                "name": "Wastewater Plant",
-                "terms": [
-                    "sewage works",
-                    "sewage treatment plant",
-                    "water treatment plant",
-                    "reclamation plant"
-                ]
+                "fields": [
+                    "power"
+                ],
+                "name": "Power"
             },
             },
-            "man_made/water_tower": {
-                "icon": "water",
+            "power/generator": {
+                "name": "Power Generator",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "man_made": "water_tower"
+                    "power": "generator"
                 },
                 },
-                "name": "Water Tower"
+                "fields": [
+                    "generator/source",
+                    "generator/method",
+                    "generator/type"
+                ]
             },
             },
-            "man_made/water_well": {
+            "power/line": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "area"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "man_made": "water_well"
+                    "power": "line"
                 },
                 },
-                "name": "Water well"
+                "name": "Power Line",
+                "icon": "power-line"
             },
             },
-            "man_made/water_works": {
-                "icon": "water",
+            "power/minor_line": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "area"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "man_made": "water_works"
+                    "power": "minor_line"
                 },
                 },
-                "name": "Water Works"
+                "name": "Minor Power Line",
+                "icon": "power-line"
             },
             },
-            "military/airfield": {
+            "power/pole": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "military": "airfield"
+                    "power": "pole"
                 },
                 },
-                "terms": [],
-                "name": "Airfield",
-                "icon": "airfield"
+                "name": "Power Pole"
             },
             },
-            "military/barracks": {
+            "power/sub_station": {
+                "fields": [
+                    "operator",
+                    "building"
+                ],
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "military": "barracks"
+                    "power": "sub_station"
                 },
                 },
-                "terms": [],
-                "name": "Barracks"
+                "name": "Substation"
             },
             },
-            "military/bunker": {
+            "power/tower": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "military": "bunker"
+                    "power": "tower"
                 },
                 },
-                "terms": [],
-                "name": "Bunker"
+                "name": "High-Voltage Tower"
             },
             },
-            "military/range": {
+            "power/transformer": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "military": "range"
+                    "power": "transformer"
                 },
                 },
-                "terms": [],
-                "name": "Military Range"
+                "name": "Transformer"
             },
             },
-            "natural": {
+            "public_transport/platform": {
                 "fields": [
                 "fields": [
-                    "natural"
+                    "ref",
+                    "operator",
+                    "network",
+                    "shelter"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                 ],
                 "geometry": [
                     "point",
                     "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "natural": "*"
-                },
-                "name": "Natural"
-            },
-            "natural/bay": {
-                "geometry": [
-                    "point",
-                    "area"
-                ],
-                "terms": [],
-                "tags": {
-                    "natural": "bay"
+                    "public_transport": "platform"
                 },
                 },
-                "name": "Bay"
+                "name": "Platform"
             },
             },
-            "natural/beach": {
+            "public_transport/stop_position": {
                 "fields": [
                 "fields": [
-                    "surface"
+                    "ref",
+                    "operator",
+                    "network"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "point",
-                    "area"
+                    "vertex"
                 ],
                 ],
-                "terms": [],
                 "tags": {
                 "tags": {
-                    "natural": "beach"
+                    "public_transport": "stop_position"
                 },
                 },
-                "name": "Beach"
+                "name": "Stop Position"
             },
             },
-            "natural/cliff": {
+            "railway": {
+                "fields": [
+                    "railway"
+                ],
                 "geometry": [
                     "point",
                     "vertex",
                     "line",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "line",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
                 "tags": {
-                    "natural": "cliff"
+                    "railway": "*"
                 },
                 },
-                "name": "Cliff"
+                "name": "Railway"
             },
             },
-            "natural/coastline": {
+            "railway/abandoned": {
+                "icon": "railway-abandoned",
                 "geometry": [
                     "line"
                 ],
                 "geometry": [
                     "line"
                 ],
-                "terms": [
-                    "shore"
-                ],
                 "tags": {
                 "tags": {
-                    "natural": "coastline"
+                    "railway": "abandoned"
                 },
                 },
-                "name": "Coastline"
+                "fields": [
+                    "structure"
+                ],
+                "terms": [],
+                "name": "Abandoned Railway"
             },
             },
-            "natural/fell": {
+            "railway/disused": {
+                "icon": "railway-disused",
                 "geometry": [
                 "geometry": [
-                    "area"
+                    "line"
                 ],
                 ],
-                "terms": [],
                 "tags": {
                 "tags": {
-                    "natural": "fell"
+                    "railway": "disused"
                 },
                 },
-                "name": "Fell"
+                "fields": [
+                    "structure"
+                ],
+                "terms": [],
+                "name": "Disused Railway"
             },
             },
-            "natural/glacier": {
+            "railway/funicular": {
                 "geometry": [
                 "geometry": [
-                    "area"
+                    "line"
+                ],
+                "terms": [
+                    "venicular",
+                    "cliff railway",
+                    "cable car",
+                    "cable railway",
+                    "funicular railway"
+                ],
+                "fields": [
+                    "structure",
+                    "gauge"
                 ],
                 ],
-                "terms": [],
                 "tags": {
                 "tags": {
-                    "natural": "glacier"
+                    "railway": "funicular"
                 },
                 },
-                "name": "Glacier"
+                "icon": "railway-rail",
+                "name": "Funicular"
             },
             },
-            "natural/grassland": {
+            "railway/halt": {
+                "icon": "rail",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "area"
+                    "vertex"
                 ],
                 ],
-                "terms": [],
                 "tags": {
                 "tags": {
-                    "natural": "grassland"
+                    "railway": "halt"
                 },
                 },
-                "name": "Grassland"
+                "name": "Railway Halt",
+                "terms": [
+                    "break",
+                    "interrupt",
+                    "rest",
+                    "wait",
+                    "interruption"
+                ]
             },
             },
-            "natural/heath": {
+            "railway/level_crossing": {
+                "icon": "cross",
                 "geometry": [
                 "geometry": [
-                    "area"
+                    "vertex"
                 ],
                 ],
-                "terms": [],
                 "tags": {
                 "tags": {
-                    "natural": "heath"
+                    "railway": "level_crossing"
                 },
                 },
-                "name": "Heath"
-            },
-            "natural/peak": {
-                "icon": "triangle",
-                "fields": [
-                    "elevation"
+                "terms": [
+                    "crossing",
+                    "railroad crossing",
+                    "railway crossing",
+                    "grade crossing",
+                    "road through railroad",
+                    "train crossing"
                 ],
                 ],
+                "name": "Level Crossing"
+            },
+            "railway/monorail": {
+                "icon": "railway-monorail",
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "natural": "peak"
+                    "railway": "monorail"
                 },
                 },
-                "terms": [
-                    "acme",
-                    "aiguille",
-                    "alp",
-                    "climax",
-                    "crest",
-                    "crown",
-                    "hill",
-                    "mount",
-                    "mountain",
-                    "pinnacle",
-                    "summit",
-                    "tip",
-                    "top"
+                "fields": [
+                    "structure",
+                    "electrified"
                 ],
                 ],
-                "name": "Peak"
+                "terms": [],
+                "name": "Monorail"
             },
             },
-            "natural/scree": {
+            "railway/narrow_gauge": {
+                "icon": "railway-rail",
                 "geometry": [
                 "geometry": [
-                    "area"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "natural": "scree"
+                    "railway": "narrow_gauge"
                 },
                 },
+                "fields": [
+                    "structure",
+                    "gauge",
+                    "electrified"
+                ],
                 "terms": [
                 "terms": [
-                    "loose rocks"
+                    "narrow gauge railway",
+                    "narrow gauge railroad"
                 ],
                 ],
-                "name": "Scree"
+                "name": "Narrow Gauge Rail"
             },
             },
-            "natural/scrub": {
+            "railway/platform": {
                 "geometry": [
                 "geometry": [
+                    "point",
+                    "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "natural": "scrub"
+                    "railway": "platform"
                 },
                 },
-                "terms": [],
-                "name": "Scrub"
+                "name": "Railway Platform"
             },
             },
-            "natural/spring": {
+            "railway/rail": {
+                "icon": "railway-rail",
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex"
+                    "line"
                 ],
                 ],
-                "terms": [],
                 "tags": {
                 "tags": {
-                    "natural": "spring"
+                    "railway": "rail"
                 },
                 },
-                "name": "Spring"
+                "fields": [
+                    "structure",
+                    "gauge",
+                    "electrified"
+                ],
+                "terms": [],
+                "name": "Rail"
             },
             },
-            "natural/tree": {
+            "railway/station": {
+                "icon": "rail",
                 "fields": [
                 "fields": [
-                    "tree_type",
-                    "denotation"
+                    "building_area"
                 ],
                 ],
-                "icon": "park",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex"
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "terms": [],
                 "tags": {
                 "tags": {
-                    "natural": "tree"
+                    "railway": "station"
                 },
                 },
-                "name": "Tree"
+                "terms": [
+                    "train station",
+                    "station"
+                ],
+                "name": "Railway Station"
             },
             },
-            "natural/water": {
+            "railway/subway": {
+                "icon": "railway-subway",
                 "fields": [
                 "fields": [
-                    "water"
+                    "structure",
+                    "gauge",
+                    "electrified"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "area"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "natural": "water"
+                    "railway": "subway"
                 },
                 },
-                "icon": "water",
-                "name": "Water"
+                "terms": [],
+                "name": "Subway"
             },
             },
-            "natural/water/lake": {
+            "railway/subway_entrance": {
+                "icon": "rail-metro",
                 "geometry": [
                 "geometry": [
-                    "area"
+                    "point"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "natural": "water",
-                    "water": "lake"
+                    "railway": "subway_entrance"
                 },
                 },
-                "terms": [
-                    "lakelet",
-                    "loch",
-                    "mere"
-                ],
-                "icon": "water",
-                "name": "Lake"
+                "terms": [],
+                "name": "Subway Entrance"
             },
             },
-            "natural/water/pond": {
+            "railway/tram": {
+                "icon": "railway-light-rail",
                 "geometry": [
                 "geometry": [
-                    "area"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "natural": "water",
-                    "water": "pond"
+                    "railway": "tram"
                 },
                 },
+                "fields": [
+                    "structure",
+                    "gauge",
+                    "electrified"
+                ],
                 "terms": [
                 "terms": [
-                    "lakelet",
-                    "millpond",
-                    "tarn",
-                    "pool",
-                    "mere"
+                    "streetcar"
                 ],
                 ],
-                "icon": "water",
-                "name": "Pond"
+                "name": "Tram"
             },
             },
-            "natural/water/reservoir": {
+            "relation": {
+                "name": "Relation",
+                "icon": "relation",
+                "tags": {},
                 "geometry": [
                 "geometry": [
-                    "area"
+                    "relation"
                 ],
                 ],
-                "tags": {
-                    "natural": "water",
-                    "water": "reservoir"
-                },
-                "icon": "water",
-                "name": "Reservoir"
-            },
-            "natural/wetland": {
-                "icon": "wetland",
                 "fields": [
                 "fields": [
-                    "wetland"
-                ],
+                    "relation"
+                ]
+            },
+            "route/ferry": {
+                "icon": "ferry",
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "area"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "natural": "wetland"
+                    "route": "ferry"
                 },
                 },
-                "terms": [],
-                "name": "Wetland"
+                "name": "Ferry Route"
             },
             },
-            "natural/wood": {
+            "shop": {
+                "icon": "shop",
                 "fields": [
                 "fields": [
-                    "wood"
+                    "shop",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
-                "icon": "park2",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "natural": "wood"
+                    "shop": "*"
                 },
                 "terms": [],
                 },
                 "terms": [],
-                "name": "Wood"
+                "name": "Shop"
             },
             },
-            "office": {
-                "icon": "commercial",
+            "shop/alcohol": {
+                "icon": "alcohol-shop",
                 "fields": [
                 "fields": [
-                    "office",
                     "address",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -64842,15 +68274,18 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "*"
+                    "shop": "alcohol"
                 },
                 },
-                "terms": [],
-                "name": "Office"
+                "terms": [
+                    "alcohol"
+                ],
+                "name": "Liquor Store"
             },
             },
-            "office/accountant": {
-                "icon": "commercial",
+            "shop/art": {
+                "icon": "art-gallery",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -64858,16 +68293,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
                     "vertex",
                     "area"
                 ],
+                "terms": [
+                    "art store",
+                    "art gallery"
+                ],
                 "tags": {
                 "tags": {
-                    "office": "accountant"
+                    "shop": "art"
                 },
                 },
-                "terms": [],
-                "name": "Accountant"
+                "name": "Art Shop"
             },
             },
-            "office/administrative": {
-                "icon": "commercial",
+            "shop/bakery": {
+                "icon": "bakery",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -64876,15 +68315,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "administrative"
+                    "shop": "bakery"
                 },
                 },
-                "terms": [],
-                "name": "Administrative Office"
+                "name": "Bakery"
             },
             },
-            "office/architect": {
-                "icon": "commercial",
+            "shop/beauty": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -64892,16 +68331,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
                     "vertex",
                     "area"
                 ],
+                "terms": [
+                    "nail spa",
+                    "spa",
+                    "salon",
+                    "tanning"
+                ],
                 "tags": {
                 "tags": {
-                    "office": "architect"
+                    "shop": "beauty"
                 },
                 },
-                "terms": [],
-                "name": "Architect"
+                "name": "Beauty Shop"
             },
             },
-            "office/company": {
-                "icon": "commercial",
+            "shop/beverages": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -64910,15 +68355,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "company"
+                    "shop": "beverages"
                 },
                 },
-                "terms": [],
-                "name": "Company Office"
+                "name": "Beverage Store"
             },
             },
-            "office/educational_institution": {
-                "icon": "commercial",
+            "shop/bicycle": {
+                "icon": "bicycle",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -64927,15 +68372,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "educational_institution"
+                    "shop": "bicycle"
                 },
                 },
-                "terms": [],
-                "name": "Educational Institution"
+                "name": "Bicycle Shop"
             },
             },
-            "office/employment_agency": {
-                "icon": "commercial",
+            "shop/bookmaker": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -64944,15 +68389,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "employment_agency"
+                    "shop": "bookmaker"
                 },
                 },
-                "terms": [],
-                "name": "Employment Agency"
+                "name": "Bookmaker"
             },
             },
-            "office/estate_agent": {
-                "icon": "commercial",
+            "shop/books": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -64961,15 +68406,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "estate_agent"
+                    "shop": "books"
                 },
                 },
-                "terms": [],
-                "name": "Real Estate Office"
+                "name": "Bookstore"
             },
             },
-            "office/financial": {
-                "icon": "commercial",
+            "shop/boutique": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -64978,15 +68423,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "financial"
+                    "shop": "boutique"
                 },
                 },
-                "terms": [],
-                "name": "Financial Office"
+                "name": "Boutique"
             },
             },
-            "office/government": {
-                "icon": "commercial",
+            "shop/butcher": {
+                "icon": "slaughterhouse",
                 "fields": [
                 "fields": [
-                    "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -64994,14 +68438,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
                     "vertex",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "office": "government"
+                    "shop": "butcher"
                 },
                 },
-                "terms": [],
-                "name": "Government Office"
+                "name": "Butcher"
             },
             },
-            "office/insurance": {
-                "icon": "commercial",
+            "shop/car": {
+                "icon": "car",
                 "fields": [
                     "address",
                     "opening_hours"
                 "fields": [
                     "address",
                     "opening_hours"
@@ -65012,15 +68456,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "insurance"
+                    "shop": "car"
                 },
                 },
-                "terms": [],
-                "name": "Insurance Office"
+                "name": "Car Dealership"
             },
             },
-            "office/it": {
-                "icon": "commercial",
+            "shop/car_parts": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65029,15 +68473,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "it"
+                    "shop": "car_parts"
                 },
                 },
-                "terms": [],
-                "name": "IT Office"
+                "name": "Car Parts Store"
             },
             },
-            "office/lawyer": {
-                "icon": "commercial",
+            "shop/car_repair": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65046,15 +68490,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "lawyer"
+                    "shop": "car_repair"
                 },
                 },
-                "terms": [],
-                "name": "Law Office"
+                "name": "Car Repair Shop"
             },
             },
-            "office/newspaper": {
-                "icon": "commercial",
+            "shop/chemist": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65063,15 +68507,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "newspaper"
+                    "shop": "chemist"
                 },
                 },
-                "terms": [],
-                "name": "Newspaper"
+                "name": "Chemist"
             },
             },
-            "office/ngo": {
-                "icon": "commercial",
+            "shop/clothes": {
+                "icon": "clothing-store",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65080,15 +68524,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "ngo"
+                    "shop": "clothes"
                 },
                 },
-                "terms": [],
-                "name": "NGO Office"
+                "name": "Clothing Store"
             },
             },
-            "office/physician": {
-                "icon": "commercial",
+            "shop/computer": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65097,15 +68541,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "physician"
+                    "shop": "computer"
                 },
                 },
-                "terms": [],
-                "name": "Physician"
+                "name": "Computer Store"
             },
             },
-            "office/political_party": {
-                "icon": "commercial",
+            "shop/confectionery": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65114,15 +68558,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "political_party"
+                    "shop": "confectionery"
                 },
                 },
-                "terms": [],
-                "name": "Political Party"
+                "name": "Confectionery"
             },
             },
-            "office/research": {
-                "icon": "commercial",
+            "shop/convenience": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65131,15 +68575,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "research"
+                    "shop": "convenience"
                 },
                 },
-                "terms": [],
-                "name": "Research Office"
+                "name": "Convenience Store"
             },
             },
-            "office/telecommunication": {
-                "icon": "commercial",
+            "shop/deli": {
+                "icon": "restaurant",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65148,15 +68592,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "telecommunication"
+                    "shop": "deli"
                 },
                 },
-                "terms": [],
-                "name": "Telecom Office"
+                "name": "Deli"
             },
             },
-            "office/therapist": {
-                "icon": "commercial",
+            "shop/department_store": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65165,15 +68609,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "therapist"
+                    "shop": "department_store"
                 },
                 },
-                "terms": [],
-                "name": "Therapist"
+                "name": "Department Store"
             },
             },
-            "office/travel_agent": {
-                "icon": "suitcase",
+            "shop/doityourself": {
+                "icon": "shop",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65182,15 +68626,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "office": "travel_agent"
+                    "shop": "doityourself"
                 },
                 },
-                "terms": [],
-                "name": "Travel Agency",
-                "searchable": false
+                "name": "DIY Store"
             },
             },
-            "place": {
+            "shop/dry_cleaning": {
+                "icon": "shop",
                 "fields": [
                 "fields": [
-                    "place"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -65198,431 +68643,280 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "place": "*"
+                    "shop": "dry_cleaning"
                 },
                 },
-                "name": "Place"
+                "name": "Dry Cleaners"
             },
             },
-            "place/city": {
-                "icon": "city",
+            "shop/electronics": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "place": "city"
+                    "shop": "electronics"
                 },
                 },
-                "name": "City"
+                "name": "Electronics Store"
             },
             },
-            "place/hamlet": {
-                "icon": "triangle-stroked",
+            "shop/farm": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "place": "hamlet"
+                    "shop": "farm"
                 },
                 },
-                "name": "Hamlet"
-            },
-            "place/island": {
-                "geometry": [
-                    "point",
-                    "area"
-                ],
                 "terms": [
                 "terms": [
-                    "archipelago",
-                    "atoll",
-                    "bar",
-                    "cay",
-                    "isle",
-                    "islet",
-                    "key",
-                    "reef"
+                    "farm shop",
+                    "farm stand"
                 ],
                 ],
-                "tags": {
-                    "place": "island"
-                },
-                "name": "Island"
+                "name": "Produce Stand"
             },
             },
-            "place/isolated_dwelling": {
-                "geometry": [
-                    "point",
-                    "area"
+            "shop/fishmonger": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 ],
-                "tags": {
-                    "place": "isolated_dwelling"
-                },
-                "name": "Isolated Dwelling"
-            },
-            "place/locality": {
-                "icon": "marker",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "place": "locality"
+                    "shop": "fishmonger"
                 },
                 },
-                "name": "Locality"
+                "name": "Fishmonger"
             },
             },
-            "place/town": {
-                "icon": "town",
-                "geometry": [
-                    "point",
-                    "area"
+            "shop/florist": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 ],
-                "tags": {
-                    "place": "town"
-                },
-                "name": "Town"
-            },
-            "place/village": {
-                "icon": "village",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "place": "village"
+                    "shop": "florist"
                 },
                 },
-                "name": "Village"
+                "name": "Florist"
             },
             },
-            "point": {
-                "name": "Point",
-                "tags": {},
-                "geometry": [
-                    "point"
+            "shop/furniture": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 ],
-                "matchScore": 0.1
-            },
-            "power": {
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
-                    "line",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "power": "*"
+                    "shop": "furniture"
                 },
                 },
+                "name": "Furniture Store"
+            },
+            "shop/garden_centre": {
+                "icon": "shop",
                 "fields": [
                 "fields": [
-                    "power"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 ],
-                "name": "Power"
-            },
-            "power/generator": {
-                "name": "Power Generator",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "power": "generator"
-                },
-                "fields": [
-                    "generator/source",
-                    "generator/method",
-                    "generator/type"
-                ]
-            },
-            "power/line": {
-                "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "power": "line"
-                },
-                "name": "Power Line",
-                "icon": "power-line"
-            },
-            "power/minor_line": {
-                "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "power": "minor_line"
-                },
-                "name": "Minor Power Line",
-                "icon": "power-line"
-            },
-            "power/pole": {
-                "geometry": [
-                    "vertex"
+                "terms": [
+                    "garden centre"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "power": "pole"
+                    "shop": "garden_centre"
                 },
                 },
-                "name": "Power Pole"
+                "name": "Garden Center"
             },
             },
-            "power/sub_station": {
+            "shop/gift": {
+                "icon": "shop",
                 "fields": [
                 "fields": [
-                    "operator",
-                    "building"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "power": "sub_station"
+                    "shop": "gift"
                 },
                 },
-                "name": "Substation"
+                "name": "Gift Shop"
             },
             },
-            "power/tower": {
-                "geometry": [
-                    "vertex"
+            "shop/greengrocer": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 ],
-                "tags": {
-                    "power": "tower"
-                },
-                "name": "High-Voltage Tower"
-            },
-            "power/transformer": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "power": "transformer"
+                    "shop": "greengrocer"
                 },
                 },
-                "name": "Transformer"
+                "name": "Greengrocer"
             },
             },
-            "public_transport/platform": {
+            "shop/hairdresser": {
+                "icon": "shop",
                 "fields": [
                 "fields": [
-                    "ref",
-                    "operator",
-                    "network",
-                    "shelter"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                 ],
                 "geometry": [
                     "point",
                     "vertex",
-                    "line",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "public_transport": "platform"
+                    "shop": "hairdresser"
                 },
                 },
-                "name": "Platform"
+                "name": "Hairdresser"
             },
             },
-            "public_transport/stop_position": {
+            "shop/hardware": {
+                "icon": "shop",
                 "fields": [
                 "fields": [
-                    "ref",
-                    "operator",
-                    "network"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "public_transport": "stop_position"
+                    "shop": "hardware"
                 },
                 },
-                "name": "Stop Position"
+                "name": "Hardware Store"
             },
             },
-            "railway": {
+            "shop/hifi": {
+                "icon": "shop",
                 "fields": [
                 "fields": [
-                    "railway"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                 ],
                 "geometry": [
                     "point",
                     "vertex",
-                    "line",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "railway": "*"
-                },
-                "name": "Railway"
-            },
-            "railway/abandoned": {
-                "icon": "railway-abandoned",
-                "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "railway": "abandoned"
+                    "shop": "hifi"
                 },
                 },
-                "fields": [
-                    "structure"
-                ],
-                "terms": [],
-                "name": "Abandoned Railway"
+                "name": "Hifi Store"
             },
             },
-            "railway/disused": {
-                "icon": "railway-disused",
-                "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "railway": "disused"
-                },
+            "shop/jewelry": {
+                "icon": "shop",
                 "fields": [
                 "fields": [
-                    "structure"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 ],
-                "terms": [],
-                "name": "Disused Railway"
-            },
-            "railway/halt": {
-                "icon": "rail",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex"
-                ],
-                "tags": {
-                    "railway": "halt"
-                },
-                "name": "Railway Halt",
-                "terms": [
-                    "break",
-                    "interrupt",
-                    "rest",
-                    "wait",
-                    "interruption"
-                ]
-            },
-            "railway/level_crossing": {
-                "icon": "cross",
-                "geometry": [
-                    "vertex"
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "railway": "level_crossing"
+                    "shop": "jewelry"
                 },
                 },
-                "terms": [
-                    "crossing",
-                    "railroad crossing",
-                    "railway crossing",
-                    "grade crossing",
-                    "road through railroad",
-                    "train crossing"
-                ],
-                "name": "Level Crossing"
+                "name": "Jeweler"
             },
             },
-            "railway/monorail": {
-                "icon": "railway-monorail",
-                "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "railway": "monorail"
-                },
+            "shop/kiosk": {
+                "icon": "shop",
                 "fields": [
                 "fields": [
-                    "structure"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 ],
-                "terms": [],
-                "name": "Monorail"
-            },
-            "railway/platform": {
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
-                    "line",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "railway": "platform"
+                    "shop": "kiosk"
                 },
                 },
-                "name": "Railway Platform"
+                "name": "Kiosk"
             },
             },
-            "railway/rail": {
-                "icon": "railway-rail",
-                "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "railway": "rail"
-                },
+            "shop/laundry": {
+                "icon": "laundry",
                 "fields": [
                 "fields": [
-                    "structure"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 ],
-                "terms": [],
-                "name": "Rail"
-            },
-            "railway/station": {
-                "icon": "rail",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "railway": "station"
+                    "shop": "laundry"
                 },
                 },
-                "terms": [
-                    "train station",
-                    "station"
-                ],
-                "name": "Railway Station"
+                "name": "Laundry"
             },
             },
-            "railway/subway": {
-                "icon": "railway-subway",
+            "shop/locksmith": {
+                "icon": "shop",
                 "fields": [
                 "fields": [
-                    "structure"
-                ],
-                "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "railway": "subway"
-                },
-                "terms": [],
-                "name": "Subway"
-            },
-            "railway/subway_entrance": {
-                "icon": "rail-metro",
-                "geometry": [
-                    "point"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 ],
-                "tags": {
-                    "railway": "subway_entrance"
-                },
-                "terms": [],
-                "name": "Subway Entrance"
-            },
-            "railway/tram": {
-                "icon": "railway-light-rail",
                 "geometry": [
                 "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "railway": "tram"
-                },
-                "fields": [
-                    "structure"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "terms": [
                 ],
                 "terms": [
-                    "streetcar"
-                ],
-                "name": "Tram"
-            },
-            "relation": {
-                "name": "Relation",
-                "icon": "relation",
-                "tags": {},
-                "geometry": [
-                    "relation"
-                ],
-                "fields": [
-                    "relation"
-                ]
-            },
-            "route/ferry": {
-                "icon": "ferry",
-                "geometry": [
-                    "line"
+                    "keys"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "route": "ferry"
+                    "shop": "locksmith"
                 },
                 },
-                "name": "Ferry Route"
+                "name": "Locksmith"
             },
             },
-            "shop": {
+            "shop/lottery": {
                 "icon": "shop",
                 "fields": [
                 "icon": "shop",
                 "fields": [
-                    "shop",
                     "address",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65631,13 +68925,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "*"
-                },
-                "terms": [],
-                "name": "Shop"
+                    "shop": "lottery"
+                },
+                "name": "Lottery Shop"
             },
             },
-            "shop/alcohol": {
-                "icon": "alcohol-shop",
+            "shop/mall": {
+                "icon": "shop",
                 "fields": [
                     "address",
                     "building_area",
                 "fields": [
                     "address",
                     "building_area",
@@ -65649,15 +68942,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "alcohol"
+                    "shop": "mall"
                 },
                 },
-                "terms": [
-                    "alcohol"
-                ],
-                "name": "Liquor Store"
+                "name": "Mall"
             },
             },
-            "shop/bakery": {
-                "icon": "bakery",
+            "shop/mobile_phone": {
+                "icon": "shop",
                 "fields": [
                     "address",
                     "building_area",
                 "fields": [
                     "address",
                     "building_area",
@@ -65669,11 +68959,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "bakery"
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Bakery"
+                "name": "Mobile Phone Store"
             },
             },
-            "shop/beauty": {
+            "shop/motorcycle": {
                 "icon": "shop",
                 "fields": [
                     "address",
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65685,19 +68975,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
                     "vertex",
                     "area"
                 ],
-                "terms": [
-                    "nail spa",
-                    "spa",
-                    "salon",
-                    "tanning"
-                ],
                 "tags": {
                 "tags": {
-                    "shop": "beauty"
+                    "shop": "motorcycle"
                 },
                 },
-                "name": "Beauty Shop"
+                "name": "Motorcycle Dealership"
             },
             },
-            "shop/beverages": {
-                "icon": "shop",
+            "shop/music": {
+                "icon": "music",
                 "fields": [
                     "address",
                     "building_area",
                 "fields": [
                     "address",
                     "building_area",
@@ -65709,12 +68993,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "beverages"
+                    "shop": "music"
                 },
                 },
-                "name": "Beverage Store"
+                "name": "Music Store"
             },
             },
-            "shop/bicycle": {
-                "icon": "bicycle",
+            "shop/newsagent": {
+                "icon": "shop",
                 "fields": [
                     "address",
                     "building_area",
                 "fields": [
                     "address",
                     "building_area",
@@ -65726,11 +69010,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "bicycle"
+                    "shop": "newsagent"
                 },
                 },
-                "name": "Bicycle Shop"
+                "name": "Newsagent"
             },
             },
-            "shop/books": {
+            "shop/optician": {
                 "icon": "shop",
                 "fields": [
                     "address",
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65743,11 +69027,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "books"
+                    "shop": "optician"
                 },
                 },
-                "name": "Bookstore"
+                "name": "Optician"
             },
             },
-            "shop/boutique": {
+            "shop/outdoor": {
                 "icon": "shop",
                 "fields": [
                     "address",
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65760,13 +69044,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "boutique"
+                    "shop": "outdoor"
                 },
                 },
-                "name": "Boutique"
+                "name": "Outdoor Store"
             },
             },
-            "shop/butcher": {
-                "icon": "slaughterhouse",
+            "shop/pet": {
+                "icon": "dog-park",
                 "fields": [
                 "fields": [
+                    "address",
                     "building_area",
                     "opening_hours"
                 ],
                     "building_area",
                     "opening_hours"
                 ],
@@ -65775,16 +69060,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
                     "vertex",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
                 "tags": {
-                    "shop": "butcher"
+                    "shop": "pet"
                 },
                 },
-                "name": "Butcher"
+                "name": "Pet Store"
             },
             },
-            "shop/car": {
-                "icon": "car",
+            "shop/photo": {
+                "icon": "camera",
                 "fields": [
                     "address",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65793,11 +69078,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "car"
+                    "shop": "photo"
                 },
                 },
-                "name": "Car Dealership"
+                "name": "Photography Store"
             },
             },
-            "shop/car_parts": {
+            "shop/shoes": {
                 "icon": "shop",
                 "fields": [
                     "address",
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65810,11 +69095,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "car_parts"
+                    "shop": "shoes"
                 },
                 },
-                "name": "Car Parts Store"
+                "name": "Shoe Store"
             },
             },
-            "shop/car_repair": {
+            "shop/sports": {
                 "icon": "shop",
                 "fields": [
                     "address",
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65827,11 +69112,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "car_repair"
+                    "shop": "sports"
                 },
                 },
-                "name": "Car Repair Shop"
+                "name": "Sporting Goods Store"
             },
             },
-            "shop/chemist": {
+            "shop/stationery": {
                 "icon": "shop",
                 "fields": [
                     "address",
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65844,28 +69129,52 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "chemist"
+                    "shop": "stationery"
                 },
                 },
-                "name": "Chemist"
+                "name": "Stationery Store"
             },
             },
-            "shop/clothes": {
-                "icon": "clothing-store",
+            "shop/supermarket": {
+                "icon": "grocery",
                 "fields": [
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "terms": [
+                    "bazaar",
+                    "boutique",
+                    "chain",
+                    "co-op",
+                    "cut-rate store",
+                    "discount store",
+                    "five-and-dime",
+                    "flea market",
+                    "galleria",
+                    "grocery store",
+                    "mall",
+                    "mart",
+                    "outlet",
+                    "outlet store",
+                    "shop",
+                    "shopping center",
+                    "shopping centre",
+                    "shopping plaza",
+                    "stand",
+                    "store",
+                    "supermarket",
+                    "thrift shop"
+                ],
                 "tags": {
                 "tags": {
-                    "shop": "clothes"
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Clothing Store"
+                "name": "Supermarket"
             },
             },
-            "shop/computer": {
+            "shop/toys": {
                 "icon": "shop",
                 "fields": [
                     "address",
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65878,12 +69187,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "computer"
+                    "shop": "toys"
                 },
                 },
-                "name": "Computer Store"
+                "name": "Toy Store"
             },
             },
-            "shop/confectionery": {
-                "icon": "shop",
+            "shop/travel_agency": {
+                "icon": "suitcase",
                 "fields": [
                     "address",
                     "building_area",
                 "fields": [
                     "address",
                     "building_area",
@@ -65895,11 +69204,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "confectionery"
+                    "shop": "travel_agency"
                 },
                 },
-                "name": "Confectionery"
+                "name": "Travel Agency"
             },
             },
-            "shop/convenience": {
+            "shop/tyres": {
                 "icon": "shop",
                 "fields": [
                     "address",
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65912,12 +69221,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "convenience"
+                    "shop": "tyres"
                 },
                 },
-                "name": "Convenience Store"
+                "name": "Tire Store"
             },
             },
-            "shop/deli": {
-                "icon": "restaurant",
+            "shop/vacant": {
+                "icon": "shop",
                 "fields": [
                     "address",
                     "building_area",
                 "fields": [
                     "address",
                     "building_area",
@@ -65929,11 +69238,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "deli"
+                    "shop": "vacant"
                 },
                 },
-                "name": "Deli"
+                "name": "Vacant Shop"
             },
             },
-            "shop/department_store": {
+            "shop/variety_store": {
                 "icon": "shop",
                 "fields": [
                     "address",
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65946,11 +69255,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "department_store"
+                    "shop": "variety_store"
                 },
                 },
-                "name": "Department Store"
+                "name": "Variety Store"
             },
             },
-            "shop/doityourself": {
+            "shop/video": {
                 "icon": "shop",
                 "fields": [
                     "address",
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65963,16 +69272,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "doityourself"
+                    "shop": "video"
                 },
                 },
-                "name": "DIY Store"
+                "name": "Video Store"
             },
             },
-            "shop/dry_cleaning": {
-                "icon": "shop",
+            "tourism": {
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "tourism"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -65980,16 +69286,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "dry_cleaning"
+                    "tourism": "*"
                 },
                 },
-                "name": "Dry Cleaners"
+                "name": "Tourism"
             },
             },
-            "shop/electronics": {
-                "icon": "shop",
+            "tourism/alpine_hut": {
+                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "operator",
+                    "address"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -65997,37 +69302,36 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "electronics"
+                    "tourism": "alpine_hut"
                 },
                 },
-                "name": "Electronics Store"
+                "name": "Alpine Hut"
             },
             },
-            "shop/farm": {
-                "icon": "shop",
+            "tourism/artwork": {
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "artwork_type",
+                    "artist"
                 ],
                 ],
+                "icon": "art-gallery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "farm"
+                    "tourism": "artwork"
                 },
                 "terms": [
                 },
                 "terms": [
-                    "farm shop",
-                    "farm stand"
+                    "mural",
+                    "sculpture",
+                    "statue"
                 ],
                 ],
-                "name": "Produce Stand"
+                "name": "Artwork"
             },
             },
-            "shop/fishmonger": {
-                "icon": "shop",
+            "tourism/attraction": {
+                "icon": "monument",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "operator",
+                    "address"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -66035,33 +69339,33 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "fishmonger"
+                    "tourism": "attraction"
                 },
                 },
-                "name": "Fishmonger"
+                "name": "Tourist Attraction"
             },
             },
-            "shop/florist": {
-                "icon": "shop",
+            "tourism/camp_site": {
+                "icon": "campsite",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "operator",
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "terms": [
+                    "camping"
+                ],
                 "tags": {
                 "tags": {
-                    "shop": "florist"
+                    "tourism": "camp_site"
                 },
                 },
-                "name": "Florist"
+                "name": "Camp Site"
             },
             },
-            "shop/furniture": {
-                "icon": "shop",
+            "tourism/caravan_site": {
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "operator",
+                    "address"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -66069,36 +69373,32 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "furniture"
+                    "tourism": "caravan_site"
                 },
                 },
-                "name": "Furniture Store"
+                "name": "RV Park"
             },
             },
-            "shop/garden_centre": {
-                "icon": "shop",
+            "tourism/chalet": {
+                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [
-                    "garden centre"
-                ],
                 "tags": {
                 "tags": {
-                    "shop": "garden_centre"
+                    "tourism": "chalet"
                 },
                 },
-                "name": "Garden Center"
+                "name": "Chalet"
             },
             },
-            "shop/gift": {
-                "icon": "shop",
+            "tourism/guest_house": {
+                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "operator",
+                    "address"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -66106,16 +69406,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "gift"
+                    "tourism": "guest_house"
                 },
                 },
-                "name": "Gift Shop"
+                "terms": [
+                    "B&B",
+                    "Bed & Breakfast",
+                    "Bed and Breakfast"
+                ],
+                "name": "Guest House"
             },
             },
-            "shop/greengrocer": {
-                "icon": "shop",
+            "tourism/hostel": {
+                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -66123,33 +69428,34 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "greengrocer"
+                    "tourism": "hostel"
                 },
                 },
-                "name": "Greengrocer"
+                "name": "Hostel"
             },
             },
-            "shop/hairdresser": {
-                "icon": "shop",
+            "tourism/hotel": {
+                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "shop": "hairdresser"
+                    "tourism": "hotel"
                 },
                 },
-                "name": "Hairdresser"
+                "name": "Hotel"
             },
             },
-            "shop/hardware": {
-                "icon": "shop",
+            "tourism/information": {
                 "fields": [
                 "fields": [
-                    "address",
+                    "information",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address",
+                    "operator"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -66157,16 +69463,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "hardware"
+                    "tourism": "information"
                 },
                 },
-                "name": "Hardware Store"
+                "name": "Information"
             },
             },
-            "shop/hifi": {
-                "icon": "shop",
+            "tourism/motel": {
+                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -66174,50 +69480,64 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "hifi"
+                    "tourism": "motel"
                 },
                 },
-                "name": "Hifi Store"
+                "name": "Motel"
             },
             },
-            "shop/jewelry": {
-                "icon": "shop",
+            "tourism/museum": {
+                "icon": "museum",
                 "fields": [
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "terms": [
+                    "exhibition",
+                    "exhibits archive",
+                    "foundation",
+                    "gallery",
+                    "hall",
+                    "institution",
+                    "library",
+                    "menagerie",
+                    "repository",
+                    "salon",
+                    "storehouse",
+                    "treasury",
+                    "vault"
+                ],
                 "tags": {
                 "tags": {
-                    "shop": "jewelry"
+                    "tourism": "museum"
                 },
                 },
-                "name": "Jeweler"
+                "name": "Museum"
             },
             },
-            "shop/kiosk": {
-                "icon": "shop",
+            "tourism/picnic_site": {
                 "fields": [
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
                 "tags": {
-                    "shop": "kiosk"
+                    "tourism": "picnic_site"
                 },
                 },
-                "name": "Kiosk"
+                "name": "Picnic Site"
             },
             },
-            "shop/laundry": {
-                "icon": "laundry",
+            "tourism/theme_park": {
                 "fields": [
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                 ],
                 "geometry": [
                     "point",
@@ -66225,5729 +69545,5786 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "laundry"
+                    "tourism": "theme_park"
                 },
                 },
-                "name": "Laundry"
+                "name": "Theme Park"
             },
             },
-            "shop/locksmith": {
-                "icon": "shop",
+            "tourism/viewpoint": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "tourism": "viewpoint"
+                },
+                "name": "Viewpoint"
+            },
+            "tourism/zoo": {
+                "icon": "zoo",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "operator",
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [
-                    "keys"
+                "tags": {
+                    "tourism": "zoo"
+                },
+                "name": "Zoo"
+            },
+            "type/boundary": {
+                "geometry": [
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "locksmith"
+                    "type": "boundary"
                 },
                 },
-                "name": "Locksmith"
+                "name": "Boundary",
+                "icon": "boundary",
+                "fields": [
+                    "boundary"
+                ]
             },
             },
-            "shop/mall": {
-                "icon": "shop",
+            "type/boundary/administrative": {
+                "name": "Administrative Boundary",
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "boundary",
+                    "boundary": "administrative"
+                },
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "admin_level"
                 ],
                 ],
+                "icon": "boundary"
+            },
+            "type/multipolygon": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "area",
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "mall"
+                    "type": "multipolygon"
                 },
                 },
-                "name": "Mall"
+                "removeTags": {},
+                "name": "Multipolygon",
+                "icon": "multipolygon",
+                "searchable": false,
+                "matchScore": 0.1
             },
             },
-            "shop/mobile_phone": {
-                "icon": "shop",
+            "type/restriction": {
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "restriction"
+                },
+                "name": "Restriction",
+                "icon": "restriction",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "restriction"
+                ]
+            },
+            "type/route": {
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "route"
+                },
+                "name": "Route",
+                "icon": "route",
+                "fields": [
+                    "route",
+                    "ref"
+                ]
+            },
+            "type/route/bicycle": {
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "route",
+                    "route": "bicycle"
+                },
+                "name": "Cycle Route",
+                "icon": "route-bicycle",
+                "fields": [
+                    "ref",
+                    "network"
+                ]
+            },
+            "type/route/bus": {
+                "geometry": [
+                    "relation"
                 ],
                 ],
+                "tags": {
+                    "type": "route",
+                    "route": "bus"
+                },
+                "name": "Bus Route",
+                "icon": "route-bus",
+                "fields": [
+                    "ref",
+                    "operator",
+                    "network"
+                ]
+            },
+            "type/route/detour": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "mobile_phone"
+                    "type": "route",
+                    "route": "detour"
                 },
                 },
-                "name": "Mobile Phone Store"
-            },
-            "shop/motorcycle": {
-                "icon": "shop",
+                "name": "Detour Route",
+                "icon": "route-detour",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+                    "ref"
+                ]
+            },
+            "type/route/ferry": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "motorcycle"
+                    "type": "route",
+                    "route": "ferry"
                 },
                 },
-                "name": "Motorcycle Dealership"
-            },
-            "shop/music": {
-                "icon": "music",
+                "name": "Ferry Route",
+                "icon": "route-ferry",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+                    "ref",
+                    "operator",
+                    "network"
+                ]
+            },
+            "type/route/foot": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "music"
+                    "type": "route",
+                    "route": "foot"
                 },
                 },
-                "name": "Music Store"
-            },
-            "shop/newsagent": {
-                "icon": "shop",
+                "name": "Foot Route",
+                "icon": "route-foot",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+                    "ref",
+                    "operator",
+                    "network"
+                ]
+            },
+            "type/route/hiking": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "newsagent"
+                    "type": "route",
+                    "route": "hiking"
                 },
                 },
-                "name": "Newsagent"
-            },
-            "shop/optician": {
-                "icon": "shop",
+                "name": "Hiking Route",
+                "icon": "route-foot",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+                    "ref",
+                    "operator",
+                    "network"
+                ]
+            },
+            "type/route/pipeline": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "optician"
+                    "type": "route",
+                    "route": "pipeline"
                 },
                 },
-                "name": "Optician"
-            },
-            "shop/outdoor": {
-                "icon": "shop",
+                "name": "Pipeline Route",
+                "icon": "route-pipeline",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+                    "ref",
+                    "operator"
+                ]
+            },
+            "type/route/power": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "outdoor"
+                    "type": "route",
+                    "route": "power"
                 },
                 },
-                "name": "Outdoor Store"
-            },
-            "shop/pet": {
-                "icon": "dog-park",
+                "name": "Power Route",
+                "icon": "route-power",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+                    "ref",
+                    "operator"
+                ]
+            },
+            "type/route/road": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "pet"
+                    "type": "route",
+                    "route": "road"
                 },
                 },
-                "name": "Pet Store"
-            },
-            "shop/photo": {
-                "icon": "camera",
+                "name": "Road Route",
+                "icon": "route-road",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+                    "ref"
+                ]
+            },
+            "type/route/train": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "photo"
+                    "type": "route",
+                    "route": "train"
                 },
                 },
-                "name": "Photography Store"
-            },
-            "shop/shoes": {
-                "icon": "shop",
+                "name": "Train Route",
+                "icon": "route-train",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+                    "ref",
+                    "operator"
+                ]
+            },
+            "type/route/tram": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "shoes"
+                    "type": "route",
+                    "route": "tram"
                 },
                 },
-                "name": "Shoe Store"
-            },
-            "shop/sports": {
-                "icon": "shop",
+                "name": "Tram Route",
+                "icon": "route-tram",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+                    "ref",
+                    "operator"
+                ]
+            },
+            "type/route_master": {
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "sports"
+                    "type": "route_master"
                 },
                 },
-                "name": "Sporting Goods Store"
-            },
-            "shop/stationery": {
-                "icon": "shop",
+                "name": "Route Master",
+                "icon": "route-master",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+                    "route_master",
+                    "ref",
+                    "operator",
+                    "network"
+                ]
+            },
+            "vertex": {
+                "name": "Other",
+                "tags": {},
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "vertex"
                 ],
                 ],
-                "tags": {
-                    "shop": "stationery"
-                },
-                "name": "Stationery Store"
+                "matchScore": 0.1
             },
             },
-            "shop/supermarket": {
-                "icon": "grocery",
+            "waterway": {
                 "fields": [
                 "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
+                    "waterway"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                 ],
                 "geometry": [
                     "point",
                     "vertex",
+                    "line",
                     "area"
                 ],
                     "area"
                 ],
-                "terms": [
-                    "bazaar",
-                    "boutique",
-                    "chain",
-                    "co-op",
-                    "cut-rate store",
-                    "discount store",
-                    "five-and-dime",
-                    "flea market",
-                    "galleria",
-                    "grocery store",
-                    "mall",
-                    "mart",
-                    "outlet",
-                    "outlet store",
-                    "shop",
-                    "shopping center",
-                    "shopping centre",
-                    "shopping plaza",
-                    "stand",
-                    "store",
-                    "supermarket",
-                    "thrift shop"
-                ],
                 "tags": {
                 "tags": {
-                    "shop": "supermarket"
+                    "waterway": "*"
                 },
                 },
-                "name": "Supermarket"
+                "name": "Waterway"
             },
             },
-            "shop/toys": {
-                "icon": "shop",
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+            "waterway/canal": {
+                "icon": "waterway-canal",
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "toys"
+                    "waterway": "canal"
                 },
                 },
-                "name": "Toy Store"
+                "name": "Canal"
             },
             },
-            "shop/travel_agency": {
-                "icon": "suitcase",
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+            "waterway/dam": {
+                "icon": "dam",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "travel_agency"
+                    "waterway": "dam"
                 },
                 },
-                "name": "Travel Agency"
+                "name": "Dam"
             },
             },
-            "shop/tyres": {
-                "icon": "shop",
+            "waterway/ditch": {
+                "icon": "waterway-ditch",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "tunnel"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "tyres"
+                    "waterway": "ditch"
                 },
                 },
-                "name": "Tire Store"
+                "name": "Ditch"
             },
             },
-            "shop/vacant": {
-                "icon": "shop",
+            "waterway/drain": {
+                "icon": "waterway-stream",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "tunnel"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "vacant"
+                    "waterway": "drain"
                 },
                 },
-                "name": "Vacant Shop"
+                "name": "Drain"
             },
             },
-            "shop/variety_store": {
-                "icon": "shop",
+            "waterway/river": {
+                "icon": "waterway-river",
                 "fields": [
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "tunnel"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
+                ],
+                "terms": [
+                    "beck",
+                    "branch",
+                    "brook",
+                    "course",
+                    "creek",
+                    "estuary",
+                    "rill",
+                    "rivulet",
+                    "run",
+                    "runnel",
+                    "stream",
+                    "tributary",
+                    "watercourse"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "shop": "variety_store"
+                    "waterway": "river"
                 },
                 },
-                "name": "Variety Store"
+                "name": "River"
             },
             },
-            "shop/video": {
-                "icon": "shop",
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+            "waterway/riverbank": {
+                "icon": "water",
                 "geometry": [
                 "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
                     "area"
                 ],
                 "tags": {
-                    "shop": "video"
+                    "waterway": "riverbank"
                 },
                 },
-                "name": "Video Store"
+                "name": "Riverbank"
             },
             },
-            "tourism": {
+            "waterway/stream": {
+                "icon": "waterway-stream",
                 "fields": [
                 "fields": [
-                    "tourism"
+                    "layer",
+                    "tunnel"
                 ],
                 "geometry": [
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
+                ],
+                "terms": [
+                    "beck",
+                    "branch",
+                    "brook",
+                    "burn",
+                    "course",
+                    "creek",
+                    "current",
+                    "drift",
+                    "flood",
+                    "flow",
+                    "freshet",
+                    "race",
+                    "rill",
+                    "rindle",
+                    "rivulet",
+                    "run",
+                    "runnel",
+                    "rush",
+                    "spate",
+                    "spritz",
+                    "surge",
+                    "tide",
+                    "torrent",
+                    "tributary",
+                    "watercourse"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "tourism": "*"
+                    "waterway": "stream"
                 },
                 },
-                "name": "Tourism"
+                "name": "Stream"
             },
             },
-            "tourism/alpine_hut": {
-                "icon": "lodging",
-                "fields": [
-                    "operator",
-                    "address"
-                ],
+            "waterway/weir": {
+                "icon": "dam",
                 "geometry": [
                 "geometry": [
-                    "point",
                     "vertex",
                     "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
                 ],
                 "tags": {
-                    "tourism": "alpine_hut"
+                    "waterway": "weir"
                 },
                 },
-                "name": "Alpine Hut"
+                "name": "Weir"
             },
             },
-            "tourism/artwork": {
-                "fields": [
-                    "artwork_type",
-                    "artist"
-                ],
-                "icon": "art-gallery",
+            "amenity/pub/The Green Man": {
+                "tags": {
+                    "name": "The Green Man",
+                    "amenity": "pub"
+                },
+                "name": "The Green Man",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "artwork"
-                },
-                "terms": [
-                    "mural",
-                    "sculpture",
-                    "statue"
-                ],
-                "name": "Artwork"
-            },
-            "tourism/attraction": {
-                "icon": "monument",
                 "fields": [
                 "fields": [
-                    "operator",
-                    "address"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/Kings Arms": {
+                "tags": {
+                    "name": "Kings Arms",
+                    "amenity": "pub"
+                },
+                "name": "Kings Arms",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "attraction"
-                },
-                "name": "Tourist Attraction"
-            },
-            "tourism/camp_site": {
-                "icon": "campsite",
                 "fields": [
                 "fields": [
-                    "operator",
-                    "address"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/Red Lion": {
+                "tags": {
+                    "name": "Red Lion",
+                    "amenity": "pub"
+                },
+                "name": "Red Lion",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [
-                    "camping"
-                ],
-                "tags": {
-                    "tourism": "camp_site"
-                },
-                "name": "Camp Site"
-            },
-            "tourism/caravan_site": {
                 "fields": [
                 "fields": [
-                    "operator",
-                    "address"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Ship": {
+                "tags": {
+                    "name": "The Ship",
+                    "amenity": "pub"
+                },
+                "name": "The Ship",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "caravan_site"
-                },
-                "name": "RV Park"
-            },
-            "tourism/chalet": {
-                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "operator",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The White Horse": {
+                "tags": {
+                    "name": "The White Horse",
+                    "amenity": "pub"
+                },
+                "name": "The White Horse",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "chalet"
-                },
-                "name": "Chalet"
-            },
-            "tourism/guest_house": {
-                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "operator",
-                    "address"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The White Hart": {
+                "tags": {
+                    "name": "The White Hart",
+                    "amenity": "pub"
+                },
+                "name": "The White Hart",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "guest_house"
-                },
-                "terms": [
-                    "B&B",
-                    "Bed & Breakfast",
-                    "Bed and Breakfast"
-                ],
-                "name": "Guest House"
-            },
-            "tourism/hostel": {
-                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "operator",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/Royal Oak": {
+                "tags": {
+                    "name": "Royal Oak",
+                    "amenity": "pub"
+                },
+                "name": "Royal Oak",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "hostel"
-                },
-                "name": "Hostel"
-            },
-            "tourism/hotel": {
-                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "operator",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Red Lion": {
+                "tags": {
+                    "name": "The Red Lion",
+                    "amenity": "pub"
+                },
+                "name": "The Red Lion",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [],
-                "tags": {
-                    "tourism": "hotel"
-                },
-                "name": "Hotel"
-            },
-            "tourism/information": {
                 "fields": [
                 "fields": [
-                    "infomation",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "operator"
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Kings Arms": {
+                "tags": {
+                    "name": "The Kings Arms",
+                    "amenity": "pub"
+                },
+                "name": "The Kings Arms",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "information"
-                },
-                "name": "Information"
-            },
-            "tourism/motel": {
-                "icon": "lodging",
                 "fields": [
                 "fields": [
-                    "operator",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Star": {
+                "tags": {
+                    "name": "The Star",
+                    "amenity": "pub"
+                },
+                "name": "The Star",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "motel"
-                },
-                "name": "Motel"
-            },
-            "tourism/museum": {
-                "icon": "museum",
                 "fields": [
                 "fields": [
-                    "operator",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Anchor": {
+                "tags": {
+                    "name": "The Anchor",
+                    "amenity": "pub"
+                },
+                "name": "The Anchor",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [
-                    "exhibition",
-                    "exhibits archive",
-                    "foundation",
-                    "gallery",
-                    "hall",
-                    "institution",
-                    "library",
-                    "menagerie",
-                    "repository",
-                    "salon",
-                    "storehouse",
-                    "treasury",
-                    "vault"
-                ],
-                "tags": {
-                    "tourism": "museum"
-                },
-                "name": "Museum"
-            },
-            "tourism/picnic_site": {
                 "fields": [
                 "fields": [
-                    "operator",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Cross Keys": {
+                "tags": {
+                    "name": "The Cross Keys",
+                    "amenity": "pub"
+                },
+                "name": "The Cross Keys",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [],
-                "tags": {
-                    "tourism": "picnic_site"
-                },
-                "name": "Picnic Site"
-            },
-            "tourism/theme_park": {
                 "fields": [
                 "fields": [
-                    "operator",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Wheatsheaf": {
+                "tags": {
+                    "name": "The Wheatsheaf",
+                    "amenity": "pub"
+                },
+                "name": "The Wheatsheaf",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "theme_park"
-                },
-                "name": "Theme Park"
-            },
-            "tourism/viewpoint": {
-                "geometry": [
-                    "point",
-                    "vertex"
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Crown Inn": {
                 "tags": {
                 "tags": {
-                    "tourism": "viewpoint"
+                    "name": "The Crown Inn",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Viewpoint"
-            },
-            "tourism/zoo": {
-                "icon": "zoo",
-                "fields": [
-                    "operator",
-                    "address"
-                ],
+                "name": "The Crown Inn",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "zoo"
-                },
-                "name": "Zoo"
-            },
-            "type/boundary": {
-                "geometry": [
-                    "relation"
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Kings Head": {
                 "tags": {
                 "tags": {
-                    "type": "boundary"
+                    "name": "The Kings Head",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Boundary",
-                "icon": "boundary",
-                "fields": [
-                    "boundary"
-                ]
-            },
-            "type/boundary/administrative": {
-                "name": "Administrative Boundary",
+                "name": "The Kings Head",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "type": "boundary",
-                    "boundary": "administrative"
-                },
                 "fields": [
                 "fields": [
-                    "admin_level"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
-                "icon": "boundary"
+                "suggestion": true
             },
             },
-            "type/multipolygon": {
-                "geometry": [
-                    "area",
-                    "relation"
-                ],
+            "amenity/pub/The Castle": {
                 "tags": {
                 "tags": {
-                    "type": "multipolygon"
+                    "name": "The Castle",
+                    "amenity": "pub"
                 },
                 },
-                "removeTags": {},
-                "name": "Multipolygon",
-                "icon": "multipolygon",
-                "searchable": false,
-                "matchScore": 0.1
-            },
-            "type/restriction": {
+                "name": "The Castle",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "type": "restriction"
-                },
-                "name": "Restriction",
-                "icon": "restriction",
                 "fields": [
                 "fields": [
-                    "restriction"
-                ]
-            },
-            "type/route": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Railway": {
                 "tags": {
                 "tags": {
-                    "type": "route"
+                    "name": "The Railway",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Route",
-                "icon": "route",
-                "fields": [
-                    "route",
-                    "ref"
-                ]
-            },
-            "type/route/bicycle": {
+                "name": "The Railway",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "bicycle"
-                },
-                "name": "Cycle Route",
-                "icon": "route-bicycle",
                 "fields": [
                 "fields": [
-                    "ref",
-                    "network"
-                ]
-            },
-            "type/route/bus": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The White Lion": {
                 "tags": {
                 "tags": {
-                    "type": "route",
-                    "route": "bus"
+                    "name": "The White Lion",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Bus Route",
-                "icon": "route-bus",
-                "fields": [
-                    "ref",
-                    "operator",
-                    "network"
-                ]
-            },
-            "type/route/detour": {
+                "name": "The White Lion",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "detour"
-                },
-                "name": "Detour Route",
-                "icon": "route-detour",
                 "fields": [
                 "fields": [
-                    "ref"
-                ]
-            },
-            "type/route/ferry": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Bell": {
                 "tags": {
                 "tags": {
-                    "type": "route",
-                    "route": "ferry"
+                    "name": "The Bell",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Ferry Route",
-                "icon": "route-ferry",
-                "fields": [
-                    "ref",
-                    "operator",
-                    "network"
-                ]
-            },
-            "type/route/foot": {
+                "name": "The Bell",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "foot"
-                },
-                "name": "Foot Route",
-                "icon": "route-foot",
                 "fields": [
                 "fields": [
-                    "ref",
-                    "operator",
-                    "network"
-                ]
-            },
-            "type/route/hiking": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Bull": {
                 "tags": {
                 "tags": {
-                    "type": "route",
-                    "route": "hiking"
+                    "name": "The Bull",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Hiking Route",
-                "icon": "route-foot",
-                "fields": [
-                    "ref",
-                    "operator",
-                    "network"
-                ]
-            },
-            "type/route/pipeline": {
+                "name": "The Bull",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "pipeline"
-                },
-                "name": "Pipeline Route",
-                "icon": "route-pipeline",
                 "fields": [
                 "fields": [
-                    "ref",
-                    "operator"
-                ]
-            },
-            "type/route/power": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Plough": {
                 "tags": {
                 "tags": {
-                    "type": "route",
-                    "route": "power"
+                    "name": "The Plough",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Power Route",
-                "icon": "route-power",
-                "fields": [
-                    "ref",
-                    "operator"
-                ]
-            },
-            "type/route/road": {
+                "name": "The Plough",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "road"
-                },
-                "name": "Road Route",
-                "icon": "route-road",
                 "fields": [
                 "fields": [
-                    "ref"
-                ]
-            },
-            "type/route/train": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The George": {
                 "tags": {
                 "tags": {
-                    "type": "route",
-                    "route": "train"
+                    "name": "The George",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Train Route",
-                "icon": "route-train",
-                "fields": [
-                    "ref",
-                    "operator"
-                ]
-            },
-            "type/route/tram": {
+                "name": "The George",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "tram"
-                },
-                "name": "Tram Route",
-                "icon": "route-tram",
                 "fields": [
                 "fields": [
-                    "ref",
-                    "operator"
-                ]
-            },
-            "type/route_master": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Royal Oak": {
                 "tags": {
                 "tags": {
-                    "type": "route_master"
+                    "name": "The Royal Oak",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Route Master",
-                "icon": "route-master",
-                "fields": [
-                    "route_master",
-                    "ref",
-                    "operator",
-                    "network"
-                ]
-            },
-            "vertex": {
-                "name": "Other",
-                "tags": {},
+                "name": "The Royal Oak",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "matchScore": 0.1
-            },
-            "waterway": {
                 "fields": [
                 "fields": [
-                    "waterway"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Fox": {
+                "tags": {
+                    "name": "The Fox",
+                    "amenity": "pub"
+                },
+                "name": "The Fox",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
-                    "line",
                     "area"
                 ],
                     "area"
                 ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "amenity/pub/Prince of Wales": {
                 "tags": {
                 "tags": {
-                    "waterway": "*"
+                    "name": "Prince of Wales",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Waterway"
-            },
-            "waterway/canal": {
-                "icon": "waterway-canal",
+                "name": "Prince of Wales",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Rising Sun": {
                 "tags": {
                 "tags": {
-                    "waterway": "canal"
+                    "name": "The Rising Sun",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Canal"
-            },
-            "waterway/dam": {
-                "icon": "dam",
+                "name": "The Rising Sun",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
-                    "line",
                     "area"
                 ],
                     "area"
                 ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "amenity/pub/The Prince of Wales": {
                 "tags": {
                 "tags": {
-                    "waterway": "dam"
+                    "name": "The Prince of Wales",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Dam"
-            },
-            "waterway/ditch": {
-                "icon": "waterway-ditch",
+                "name": "The Prince of Wales",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Crown": {
                 "tags": {
                 "tags": {
-                    "waterway": "ditch"
+                    "name": "The Crown",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Ditch"
-            },
-            "waterway/drain": {
-                "icon": "waterway-stream",
+                "name": "The Crown",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Chequers": {
                 "tags": {
                 "tags": {
-                    "waterway": "drain"
+                    "name": "The Chequers",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Drain"
-            },
-            "waterway/river": {
-                "icon": "waterway-river",
+                "name": "The Chequers",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "terms": [
-                    "beck",
-                    "branch",
-                    "brook",
-                    "course",
-                    "creek",
-                    "estuary",
-                    "rill",
-                    "rivulet",
-                    "run",
-                    "runnel",
-                    "stream",
-                    "tributary",
-                    "watercourse"
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Swan": {
                 "tags": {
                 "tags": {
-                    "waterway": "river"
+                    "name": "The Swan",
+                    "amenity": "pub"
                 },
                 },
-                "name": "River"
-            },
-            "waterway/riverbank": {
-                "icon": "water",
+                "name": "The Swan",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
+                    "point",
+                    "vertex",
                     "area"
                 ],
                     "area"
                 ],
-                "tags": {
-                    "waterway": "riverbank"
-                },
-                "name": "Riverbank"
-            },
-            "waterway/stream": {
-                "icon": "waterway-stream",
                 "fields": [
                 "fields": [
-                    "layer"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/Rose and Crown": {
+                "tags": {
+                    "name": "Rose and Crown",
+                    "amenity": "pub"
+                },
+                "name": "Rose and Crown",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 ],
-                "terms": [
-                    "beck",
-                    "branch",
-                    "brook",
-                    "burn",
-                    "course",
-                    "creek",
-                    "current",
-                    "drift",
-                    "flood",
-                    "flow",
-                    "freshet",
-                    "race",
-                    "rill",
-                    "rindle",
-                    "rivulet",
-                    "run",
-                    "runnel",
-                    "rush",
-                    "spate",
-                    "spritz",
-                    "surge",
-                    "tide",
-                    "torrent",
-                    "tributary",
-                    "watercourse"
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Victoria": {
                 "tags": {
                 "tags": {
-                    "waterway": "stream"
+                    "name": "The Victoria",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Stream"
-            },
-            "waterway/weir": {
-                "icon": "dam",
+                "name": "The Victoria",
+                "icon": "beer",
                 "geometry": [
                 "geometry": [
+                    "point",
                     "vertex",
                     "vertex",
-                    "line"
+                    "area"
                 ],
                 ],
-                "tags": {
-                    "waterway": "weir"
-                },
-                "name": "Weir"
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
             },
             },
-            "amenity/bank/ABN AMRO": {
+            "amenity/pub/New Inn": {
                 "tags": {
                 "tags": {
-                    "name": "ABN AMRO",
-                    "amenity": "bank"
+                    "name": "New Inn",
+                    "amenity": "pub"
                 },
                 },
-                "name": "ABN AMRO",
-                "icon": "bank",
+                "name": "New Inn",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ABSA": {
+            "amenity/pub/Royal Hotel": {
                 "tags": {
                 "tags": {
-                    "name": "ABSA",
-                    "amenity": "bank"
+                    "name": "Royal Hotel",
+                    "amenity": "pub"
                 },
                 },
-                "name": "ABSA",
-                "icon": "bank",
+                "name": "Royal Hotel",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/AIB": {
+            "amenity/pub/Cross Keys": {
                 "tags": {
                 "tags": {
-                    "name": "AIB",
-                    "amenity": "bank"
+                    "name": "Cross Keys",
+                    "amenity": "pub"
                 },
                 },
-                "name": "AIB",
-                "icon": "bank",
+                "name": "Cross Keys",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ANZ": {
+            "amenity/pub/The Greyhound": {
                 "tags": {
                 "tags": {
-                    "name": "ANZ",
-                    "amenity": "bank"
+                    "name": "The Greyhound",
+                    "amenity": "pub"
                 },
                 },
-                "name": "ANZ",
-                "icon": "bank",
+                "name": "The Greyhound",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/AXA": {
+            "amenity/pub/The Black Horse": {
                 "tags": {
                 "tags": {
-                    "name": "AXA",
-                    "amenity": "bank"
+                    "name": "The Black Horse",
+                    "amenity": "pub"
                 },
                 },
-                "name": "AXA",
-                "icon": "bank",
+                "name": "The Black Horse",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Alior Bank": {
+            "amenity/pub/The New Inn": {
                 "tags": {
                 "tags": {
-                    "name": "Alior Bank",
-                    "amenity": "bank"
+                    "name": "The New Inn",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Alior Bank",
-                "icon": "bank",
+                "name": "The New Inn",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Allied Bank": {
+            "amenity/pub/Kings Head": {
                 "tags": {
                 "tags": {
-                    "name": "Allied Bank",
-                    "amenity": "bank"
+                    "name": "Kings Head",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Allied Bank",
-                "icon": "bank",
+                "name": "Kings Head",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Alpha Bank": {
+            "amenity/pub/The Angel": {
                 "tags": {
                 "tags": {
-                    "name": "Alpha Bank",
-                    "amenity": "bank"
+                    "name": "The Angel",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Alpha Bank",
-                "icon": "bank",
+                "name": "The Angel",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Argenta": {
+            "amenity/pub/The Queens Head": {
                 "tags": {
                 "tags": {
-                    "name": "Argenta",
-                    "amenity": "bank"
+                    "name": "The Queens Head",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Argenta",
-                "icon": "bank",
+                "name": "The Queens Head",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Axis Bank": {
+            "amenity/pub/The Ship Inn": {
                 "tags": {
                 "tags": {
-                    "name": "Axis Bank",
-                    "amenity": "bank"
+                    "name": "The Ship Inn",
+                    "amenity": "pub"
                 },
                 },
-                "name": "Axis Bank",
-                "icon": "bank",
+                "name": "The Ship Inn",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BAWAG PSK": {
+            "amenity/pub/Rose & Crown": {
                 "tags": {
                 "tags": {
-                    "name": "BAWAG PSK",
-                    "amenity": "bank"
+                    "name": "Rose & Crown",
+                    "amenity": "pub"
                 },
                 },
-                "name": "BAWAG PSK",
-                "icon": "bank",
+                "name": "Rose & Crown",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BB&T": {
+            "amenity/pub/Queens Head": {
                 "tags": {
                 "tags": {
-                    "name": "BB&T",
-                    "amenity": "bank"
+                    "name": "Queens Head",
+                    "amenity": "pub"
                 },
                 },
-                "name": "BB&T",
-                "icon": "bank",
+                "name": "Queens Head",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BBK": {
+            "amenity/pub/Irish Pub": {
                 "tags": {
                 "tags": {
-                    "name": "BBK",
-                    "amenity": "bank"
+                    "name": "Irish Pub",
+                    "amenity": "pub"
                 },
                 },
-                "name": "BBK",
-                "icon": "bank",
+                "name": "Irish Pub",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BBVA": {
+            "amenity/fuel/76": {
                 "tags": {
                 "tags": {
-                    "name": "BBVA",
-                    "amenity": "bank"
+                    "name": "76",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BBVA",
-                "icon": "bank",
+                "name": "76",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BCI": {
+            "amenity/fuel/Neste": {
                 "tags": {
                 "tags": {
-                    "name": "BCI",
-                    "amenity": "bank"
+                    "name": "Neste",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BCI",
-                "icon": "bank",
+                "name": "Neste",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BCR": {
+            "amenity/fuel/BP": {
                 "tags": {
                 "tags": {
-                    "name": "BCR",
-                    "amenity": "bank"
+                    "name": "BP",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BCR",
-                "icon": "bank",
+                "name": "BP",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
+                ],
+                "suggestion": true
+            },
+            "amenity/fuel/Shell": {
+                "tags": {
+                    "name": "Shell",
+                    "amenity": "fuel"
+                },
+                "name": "Shell",
+                "icon": "fuel",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BDO": {
+            "amenity/fuel/Agip": {
                 "tags": {
                 "tags": {
-                    "name": "BDO",
-                    "amenity": "bank"
+                    "name": "Agip",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BDO",
-                "icon": "bank",
+                "name": "Agip",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BES": {
+            "amenity/fuel/Migrol": {
                 "tags": {
                 "tags": {
-                    "name": "BES",
-                    "amenity": "bank"
+                    "name": "Migrol",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BES",
-                "icon": "bank",
+                "name": "Migrol",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BMO": {
+            "amenity/fuel/Avia": {
                 "tags": {
                 "tags": {
-                    "name": "BMO",
-                    "amenity": "bank"
+                    "name": "Avia",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BMO",
-                "icon": "bank",
+                "name": "Avia",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BNL": {
+            "amenity/fuel/Texaco": {
                 "tags": {
                 "tags": {
-                    "name": "BNL",
-                    "amenity": "bank"
+                    "name": "Texaco",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BNL",
-                "icon": "bank",
+                "name": "Texaco",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BNP": {
+            "amenity/fuel/Total": {
                 "tags": {
                 "tags": {
-                    "name": "BNP",
-                    "amenity": "bank"
+                    "name": "Total",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BNP",
-                "icon": "bank",
+                "name": "Total",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BNP Paribas": {
+            "amenity/fuel/Statoil": {
                 "tags": {
                 "tags": {
-                    "name": "BNP Paribas",
-                    "amenity": "bank"
+                    "name": "Statoil",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BNP Paribas",
-                "icon": "bank",
+                "name": "Statoil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BNP Paribas Fortis": {
+            "amenity/fuel/Esso": {
                 "tags": {
                 "tags": {
-                    "name": "BNP Paribas Fortis",
-                    "amenity": "bank"
+                    "name": "Esso",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BNP Paribas Fortis",
-                "icon": "bank",
+                "name": "Esso",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BPI": {
+            "amenity/fuel/Jet": {
                 "tags": {
                 "tags": {
-                    "name": "BPI",
-                    "amenity": "bank"
+                    "name": "Jet",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BPI",
-                "icon": "bank",
+                "name": "Jet",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BRD": {
+            "amenity/fuel/Avanti": {
                 "tags": {
                 "tags": {
-                    "name": "BRD",
-                    "amenity": "bank"
+                    "name": "Avanti",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BRD",
-                "icon": "bank",
+                "name": "Avanti",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BW-Bank": {
+            "amenity/fuel/Sainsbury's": {
                 "tags": {
                 "tags": {
-                    "name": "BW-Bank",
-                    "amenity": "bank"
+                    "name": "Sainsbury's",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BW-Bank",
-                "icon": "bank",
+                "name": "Sainsbury's",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BZ WBK": {
+            "amenity/fuel/OMV": {
                 "tags": {
                 "tags": {
-                    "name": "BZ WBK",
-                    "amenity": "bank"
+                    "name": "OMV",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BZ WBK",
-                "icon": "bank",
+                "name": "OMV",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banamex": {
+            "amenity/fuel/Aral": {
                 "tags": {
                 "tags": {
-                    "name": "Banamex",
-                    "amenity": "bank"
+                    "name": "Aral",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banamex",
-                "icon": "bank",
+                "name": "Aral",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banca Intesa": {
+            "amenity/fuel/Tesco": {
                 "tags": {
                 "tags": {
-                    "name": "Banca Intesa",
-                    "amenity": "bank"
+                    "name": "Tesco",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banca Intesa",
-                "icon": "bank",
+                "name": "Tesco",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banca Popolare di Novara": {
+            "amenity/fuel/JET": {
                 "tags": {
                 "tags": {
-                    "name": "Banca Popolare di Novara",
-                    "amenity": "bank"
+                    "name": "JET",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banca Popolare di Novara",
-                "icon": "bank",
+                "name": "JET",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banca Popolare di Vicenza": {
+            "amenity/fuel/Morrisons": {
                 "tags": {
                 "tags": {
-                    "name": "Banca Popolare di Vicenza",
-                    "amenity": "bank"
+                    "name": "Morrisons",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banca Popolare di Vicenza",
-                "icon": "bank",
+                "name": "Morrisons",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banca Transilvania": {
+            "amenity/fuel/United": {
                 "tags": {
                 "tags": {
-                    "name": "Banca Transilvania",
-                    "amenity": "bank"
+                    "name": "United",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banca Transilvania",
-                "icon": "bank",
+                "name": "United",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bancaja": {
+            "amenity/fuel/Canadian Tire": {
                 "tags": {
                 "tags": {
-                    "name": "Bancaja",
-                    "amenity": "bank"
+                    "name": "Canadian Tire",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bancaja",
-                "icon": "bank",
+                "name": "Canadian Tire",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco BCI": {
+            "amenity/fuel/Mobil": {
                 "tags": {
                 "tags": {
-                    "name": "Banco BCI",
-                    "amenity": "bank"
+                    "name": "Mobil",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco BCI",
-                "icon": "bank",
+                "name": "Mobil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Estado": {
+            "amenity/fuel/Caltex": {
                 "tags": {
                 "tags": {
-                    "name": "Banco Estado",
-                    "amenity": "bank"
+                    "name": "Caltex",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco Estado",
-                "icon": "bank",
+                "name": "Caltex",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco G&T Continental": {
+            "amenity/fuel/Sunoco": {
                 "tags": {
                 "tags": {
-                    "name": "Banco G&T Continental",
-                    "amenity": "bank"
+                    "name": "Sunoco",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco G&T Continental",
-                "icon": "bank",
+                "name": "Sunoco",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Itaú": {
+            "amenity/fuel/Q8": {
                 "tags": {
                 "tags": {
-                    "name": "Banco Itaú",
-                    "amenity": "bank"
+                    "name": "Q8",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco Itaú",
-                "icon": "bank",
+                "name": "Q8",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Nación": {
+            "amenity/fuel/ABC": {
                 "tags": {
                 "tags": {
-                    "name": "Banco Nación",
-                    "amenity": "bank"
+                    "name": "ABC",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco Nación",
-                "icon": "bank",
+                "name": "ABC",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Pastor": {
+            "amenity/fuel/Tankstelle": {
                 "tags": {
                 "tags": {
-                    "name": "Banco Pastor",
-                    "amenity": "bank"
+                    "name": "Tankstelle",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco Pastor",
-                "icon": "bank",
+                "name": "Tankstelle",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Popular": {
+            "amenity/fuel/ARAL": {
                 "tags": {
                 "tags": {
-                    "name": "Banco Popular",
-                    "amenity": "bank"
+                    "name": "ARAL",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco Popular",
-                "icon": "bank",
+                "name": "ARAL",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Provincia": {
+            "amenity/fuel/CEPSA": {
                 "tags": {
                 "tags": {
-                    "name": "Banco Provincia",
-                    "amenity": "bank"
+                    "name": "CEPSA",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco Provincia",
-                "icon": "bank",
+                "name": "CEPSA",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco Santander": {
+            "amenity/fuel/BFT": {
                 "tags": {
                 "tags": {
-                    "name": "Banco Santander",
-                    "amenity": "bank"
+                    "name": "BFT",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco Santander",
-                "icon": "bank",
+                "name": "BFT",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco de Chile": {
+            "amenity/fuel/Petron": {
                 "tags": {
                 "tags": {
-                    "name": "Banco de Chile",
-                    "amenity": "bank"
+                    "name": "Petron",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco de Chile",
-                "icon": "bank",
+                "name": "Petron",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco de Costa Rica": {
+            "amenity/fuel/Intermarché": {
                 "tags": {
                 "tags": {
-                    "name": "Banco de Costa Rica",
-                    "amenity": "bank"
+                    "name": "Intermarché",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco de Costa Rica",
-                "icon": "bank",
+                "name": "Intermarché",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco de Desarrollo Banrural": {
+            "amenity/fuel/Super U": {
                 "tags": {
                 "tags": {
-                    "name": "Banco de Desarrollo Banrural",
-                    "amenity": "bank"
+                    "name": "Super U",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco de Desarrollo Banrural",
-                "icon": "bank",
+                "name": "Super U",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco de la Nación": {
+            "amenity/fuel/Auchan": {
                 "tags": {
                 "tags": {
-                    "name": "Banco de la Nación",
-                    "amenity": "bank"
+                    "name": "Auchan",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco de la Nación",
-                "icon": "bank",
+                "name": "Auchan",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banco do Brasil": {
+            "amenity/fuel/Elf": {
                 "tags": {
                 "tags": {
-                    "name": "Banco do Brasil",
-                    "amenity": "bank"
+                    "name": "Elf",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banco do Brasil",
-                "icon": "bank",
+                "name": "Elf",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/BancoEstado": {
+            "amenity/fuel/Carrefour": {
                 "tags": {
                 "tags": {
-                    "name": "BancoEstado",
-                    "amenity": "bank"
+                    "name": "Carrefour",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "BancoEstado",
-                "icon": "bank",
+                "name": "Carrefour",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bancolombia": {
+            "amenity/fuel/Station Service E. Leclerc": {
                 "tags": {
                 "tags": {
-                    "name": "Bancolombia",
-                    "amenity": "bank"
+                    "name": "Station Service E. Leclerc",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bancolombia",
-                "icon": "bank",
+                "name": "Station Service E. Leclerc",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bancomer": {
+            "amenity/fuel/Shell Express": {
                 "tags": {
                 "tags": {
-                    "name": "Bancomer",
-                    "amenity": "bank"
+                    "name": "Shell Express",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bancomer",
-                "icon": "bank",
+                "name": "Shell Express",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bancpost": {
+            "amenity/fuel/Hess": {
                 "tags": {
                 "tags": {
-                    "name": "Bancpost",
-                    "amenity": "bank"
+                    "name": "Hess",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bancpost",
-                "icon": "bank",
+                "name": "Hess",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banesco": {
+            "amenity/fuel/Flying V": {
                 "tags": {
                 "tags": {
-                    "name": "Banesco",
-                    "amenity": "bank"
+                    "name": "Flying V",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banesco",
-                "icon": "bank",
+                "name": "Flying V",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banesto": {
+            "amenity/fuel/bft": {
                 "tags": {
                 "tags": {
-                    "name": "Banesto",
-                    "amenity": "bank"
+                    "name": "bft",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banesto",
-                "icon": "bank",
+                "name": "bft",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank Austria": {
+            "amenity/fuel/Gulf": {
                 "tags": {
                 "tags": {
-                    "name": "Bank Austria",
-                    "amenity": "bank"
+                    "name": "Gulf",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bank Austria",
-                "icon": "bank",
+                "name": "Gulf",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank Mandiri": {
+            "amenity/fuel/PTT": {
                 "tags": {
                 "tags": {
-                    "name": "Bank Mandiri",
-                    "amenity": "bank"
+                    "name": "PTT",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bank Mandiri",
-                "icon": "bank",
+                "name": "PTT",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank Spółdzielczy": {
+            "amenity/fuel/St1": {
                 "tags": {
                 "tags": {
-                    "name": "Bank Spółdzielczy",
-                    "amenity": "bank"
+                    "name": "St1",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bank Spółdzielczy",
-                "icon": "bank",
+                "name": "St1",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank of America": {
+            "amenity/fuel/Teboil": {
                 "tags": {
                 "tags": {
-                    "name": "Bank of America",
-                    "amenity": "bank"
+                    "name": "Teboil",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bank of America",
-                "icon": "bank",
+                "name": "Teboil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank of Ireland": {
+            "amenity/fuel/HEM": {
                 "tags": {
                 "tags": {
-                    "name": "Bank of Ireland",
-                    "amenity": "bank"
+                    "name": "HEM",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bank of Ireland",
-                "icon": "bank",
+                "name": "HEM",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank of Montreal": {
+            "amenity/fuel/GALP": {
                 "tags": {
                 "tags": {
-                    "name": "Bank of Montreal",
-                    "amenity": "bank"
+                    "name": "GALP",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bank of Montreal",
-                "icon": "bank",
+                "name": "GALP",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank of Scotland": {
+            "amenity/fuel/OK": {
                 "tags": {
                 "tags": {
-                    "name": "Bank of Scotland",
-                    "amenity": "bank"
+                    "name": "OK",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bank of Scotland",
-                "icon": "bank",
+                "name": "OK",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bank of the West": {
+            "amenity/fuel/ÖMV": {
                 "tags": {
                 "tags": {
-                    "name": "Bank of the West",
-                    "amenity": "bank"
+                    "name": "ÖMV",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bank of the West",
-                "icon": "bank",
+                "name": "ÖMV",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bankia": {
+            "amenity/fuel/Tinq": {
                 "tags": {
                 "tags": {
-                    "name": "Bankia",
-                    "amenity": "bank"
+                    "name": "Tinq",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bankia",
-                "icon": "bank",
+                "name": "Tinq",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bankinter": {
+            "amenity/fuel/OKQ8": {
                 "tags": {
                 "tags": {
-                    "name": "Bankinter",
-                    "amenity": "bank"
+                    "name": "OKQ8",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bankinter",
-                "icon": "bank",
+                "name": "OKQ8",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banorte": {
+            "amenity/fuel/Freie Tankstelle": {
                 "tags": {
                 "tags": {
-                    "name": "Banorte",
-                    "amenity": "bank"
+                    "name": "Freie Tankstelle",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banorte",
-                "icon": "bank",
+                "name": "Freie Tankstelle",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banque Nationale": {
+            "amenity/fuel/Repsol": {
                 "tags": {
                 "tags": {
-                    "name": "Banque Nationale",
-                    "amenity": "bank"
+                    "name": "Repsol",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banque Nationale",
-                "icon": "bank",
+                "name": "Repsol",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Banque Populaire": {
+            "amenity/fuel/Westfalen": {
                 "tags": {
                 "tags": {
-                    "name": "Banque Populaire",
-                    "amenity": "bank"
+                    "name": "Westfalen",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Banque Populaire",
-                "icon": "bank",
+                "name": "Westfalen",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Barclays": {
+            "amenity/fuel/Esso Express": {
                 "tags": {
                 "tags": {
-                    "name": "Barclays",
-                    "amenity": "bank"
+                    "name": "Esso Express",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Barclays",
-                "icon": "bank",
+                "name": "Esso Express",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Belfius": {
+            "amenity/fuel/Raiffeisenbank": {
                 "tags": {
                 "tags": {
-                    "name": "Belfius",
-                    "amenity": "bank"
+                    "name": "Raiffeisenbank",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Belfius",
-                "icon": "bank",
+                "name": "Raiffeisenbank",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bendigo Bank": {
+            "amenity/fuel/Tamoil": {
                 "tags": {
                 "tags": {
-                    "name": "Bendigo Bank",
-                    "amenity": "bank"
+                    "name": "Tamoil",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bendigo Bank",
-                "icon": "bank",
+                "name": "Tamoil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Berliner Sparkasse": {
+            "amenity/fuel/Engen": {
                 "tags": {
                 "tags": {
-                    "name": "Berliner Sparkasse",
-                    "amenity": "bank"
+                    "name": "Engen",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Berliner Sparkasse",
-                "icon": "bank",
+                "name": "Engen",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Berliner Volksbank": {
+            "amenity/fuel/Sasol": {
                 "tags": {
                 "tags": {
-                    "name": "Berliner Volksbank",
-                    "amenity": "bank"
+                    "name": "Sasol",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Berliner Volksbank",
-                "icon": "bank",
+                "name": "Sasol",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bicentenario": {
+            "amenity/fuel/Topaz": {
                 "tags": {
                 "tags": {
-                    "name": "Bicentenario",
-                    "amenity": "bank"
+                    "name": "Topaz",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bicentenario",
-                "icon": "bank",
+                "name": "Topaz",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Bradesco": {
+            "amenity/fuel/LPG": {
                 "tags": {
                 "tags": {
-                    "name": "Bradesco",
-                    "amenity": "bank"
+                    "name": "LPG",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Bradesco",
-                "icon": "bank",
+                "name": "LPG",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/CIBC": {
+            "amenity/fuel/Coop": {
                 "tags": {
                 "tags": {
-                    "name": "CIBC",
-                    "amenity": "bank"
+                    "name": "Coop",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "CIBC",
-                "icon": "bank",
+                "name": "Coop",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/CIC": {
+            "amenity/fuel/Orlen": {
                 "tags": {
                 "tags": {
-                    "name": "CIC",
-                    "amenity": "bank"
+                    "name": "Orlen",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "CIC",
-                "icon": "bank",
+                "name": "Orlen",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caisse d'Épargne": {
+            "amenity/fuel/Oilibya": {
                 "tags": {
                 "tags": {
-                    "name": "Caisse d'Épargne",
-                    "amenity": "bank"
+                    "name": "Oilibya",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Caisse d'Épargne",
-                "icon": "bank",
+                "name": "Oilibya",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caixa": {
+            "amenity/fuel/Tango": {
                 "tags": {
                 "tags": {
-                    "name": "Caixa",
-                    "amenity": "bank"
+                    "name": "Tango",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Caixa",
-                "icon": "bank",
+                "name": "Tango",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caixa Econômica Federal": {
+            "amenity/fuel/Star": {
                 "tags": {
                 "tags": {
-                    "name": "Caixa Econômica Federal",
-                    "amenity": "bank"
+                    "name": "Star",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Caixa Econômica Federal",
-                "icon": "bank",
+                "name": "Star",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caixa Geral de Depósitos": {
+            "amenity/fuel/Петрол": {
                 "tags": {
                 "tags": {
-                    "name": "Caixa Geral de Depósitos",
-                    "amenity": "bank"
+                    "name": "Петрол",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Caixa Geral de Depósitos",
-                "icon": "bank",
+                "name": "Петрол",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caja Círculo": {
+            "amenity/fuel/Cepsa": {
                 "tags": {
                 "tags": {
-                    "name": "Caja Círculo",
-                    "amenity": "bank"
+                    "name": "Cepsa",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Caja Círculo",
-                "icon": "bank",
+                "name": "Cepsa",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caja Duero": {
+            "amenity/fuel/OIL!": {
                 "tags": {
                 "tags": {
-                    "name": "Caja Duero",
-                    "amenity": "bank"
+                    "name": "OIL!",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Caja Duero",
-                "icon": "bank",
+                "name": "OIL!",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caja Madrid": {
+            "amenity/fuel/Ultramar": {
                 "tags": {
                 "tags": {
-                    "name": "Caja Madrid",
-                    "amenity": "bank"
+                    "name": "Ultramar",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Caja Madrid",
-                "icon": "bank",
+                "name": "Ultramar",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caja Rural": {
+            "amenity/fuel/Irving": {
                 "tags": {
                 "tags": {
-                    "name": "Caja Rural",
-                    "amenity": "bank"
+                    "name": "Irving",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Caja Rural",
-                "icon": "bank",
+                "name": "Irving",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Caja de Burgos": {
+            "amenity/fuel/Lukoil": {
                 "tags": {
                 "tags": {
-                    "name": "Caja de Burgos",
-                    "amenity": "bank"
+                    "name": "Lukoil",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Caja de Burgos",
-                "icon": "bank",
+                "name": "Lukoil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Cajamar": {
+            "amenity/fuel/Petro-Canada": {
                 "tags": {
                 "tags": {
-                    "name": "Cajamar",
-                    "amenity": "bank"
+                    "name": "Petro-Canada",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Cajamar",
-                "icon": "bank",
+                "name": "Petro-Canada",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Cajero Automatico Bancared": {
+            "amenity/fuel/7-Eleven": {
                 "tags": {
                 "tags": {
-                    "name": "Cajero Automatico Bancared",
-                    "amenity": "bank"
+                    "name": "7-Eleven",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Cajero Automatico Bancared",
-                "icon": "bank",
+                "name": "7-Eleven",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Canara Bank": {
+            "amenity/fuel/Agrola": {
                 "tags": {
                 "tags": {
-                    "name": "Canara Bank",
-                    "amenity": "bank"
+                    "name": "Agrola",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Canara Bank",
-                "icon": "bank",
+                "name": "Agrola",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Cassa di Risparmio del Veneto": {
+            "amenity/fuel/Husky": {
                 "tags": {
                 "tags": {
-                    "name": "Cassa di Risparmio del Veneto",
-                    "amenity": "bank"
+                    "name": "Husky",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Cassa di Risparmio del Veneto",
-                "icon": "bank",
+                "name": "Husky",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Chase": {
+            "amenity/fuel/Slovnaft": {
                 "tags": {
                 "tags": {
-                    "name": "Chase",
-                    "amenity": "bank"
+                    "name": "Slovnaft",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Chase",
-                "icon": "bank",
+                "name": "Slovnaft",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/China Bank": {
+            "amenity/fuel/Sheetz": {
                 "tags": {
                 "tags": {
-                    "name": "China Bank",
-                    "amenity": "bank"
+                    "name": "Sheetz",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "China Bank",
-                "icon": "bank",
+                "name": "Sheetz",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Chinabank": {
+            "amenity/fuel/Mol": {
                 "tags": {
                 "tags": {
-                    "name": "Chinabank",
-                    "amenity": "bank"
+                    "name": "Mol",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Chinabank",
-                "icon": "bank",
+                "name": "Mol",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Citibank": {
+            "amenity/fuel/Petronas": {
                 "tags": {
                 "tags": {
-                    "name": "Citibank",
-                    "amenity": "bank"
+                    "name": "Petronas",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Citibank",
-                "icon": "bank",
+                "name": "Petronas",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Citizens Bank": {
+            "amenity/fuel/Газпромнефть": {
                 "tags": {
                 "tags": {
-                    "name": "Citizens Bank",
-                    "amenity": "bank"
+                    "name": "Газпромнефть",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Citizens Bank",
-                "icon": "bank",
+                "name": "Газпромнефть",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/CityCommerce Bank": {
+            "amenity/fuel/Лукойл": {
                 "tags": {
                 "tags": {
-                    "name": "CityCommerce Bank",
-                    "amenity": "bank"
+                    "name": "Лукойл",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "CityCommerce Bank",
-                "icon": "bank",
+                "name": "Лукойл",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Commercial Bank of Ceylon PLC": {
+            "amenity/fuel/Elan": {
                 "tags": {
                 "tags": {
-                    "name": "Commercial Bank of Ceylon PLC",
-                    "amenity": "bank"
+                    "name": "Elan",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Commercial Bank of Ceylon PLC",
-                "icon": "bank",
+                "name": "Elan",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Commerzbank": {
+            "amenity/fuel/Роснефть": {
                 "tags": {
                 "tags": {
-                    "name": "Commerzbank",
-                    "amenity": "bank"
+                    "name": "Роснефть",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Commerzbank",
-                "icon": "bank",
+                "name": "Роснефть",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Commonwealth Bank": {
+            "amenity/fuel/Turmöl": {
                 "tags": {
                 "tags": {
-                    "name": "Commonwealth Bank",
-                    "amenity": "bank"
+                    "name": "Turmöl",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Commonwealth Bank",
-                "icon": "bank",
+                "name": "Turmöl",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Credit Agricole": {
+            "amenity/fuel/Neste A24": {
                 "tags": {
                 "tags": {
-                    "name": "Credit Agricole",
-                    "amenity": "bank"
+                    "name": "Neste A24",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Credit Agricole",
-                "icon": "bank",
+                "name": "Neste A24",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Credit Suisse": {
+            "amenity/fuel/Marathon": {
                 "tags": {
                 "tags": {
-                    "name": "Credit Suisse",
-                    "amenity": "bank"
+                    "name": "Marathon",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Credit Suisse",
-                "icon": "bank",
+                "name": "Marathon",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Crédit Agricole": {
+            "amenity/fuel/Valero": {
                 "tags": {
                 "tags": {
-                    "name": "Crédit Agricole",
-                    "amenity": "bank"
+                    "name": "Valero",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Crédit Agricole",
-                "icon": "bank",
+                "name": "Valero",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Crédit Mutuel": {
+            "amenity/fuel/Eni": {
                 "tags": {
                 "tags": {
-                    "name": "Crédit Mutuel",
-                    "amenity": "bank"
+                    "name": "Eni",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Crédit Mutuel",
-                "icon": "bank",
+                "name": "Eni",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Crédit Mutuel de Bretagne": {
+            "amenity/fuel/Chevron": {
                 "tags": {
                 "tags": {
-                    "name": "Crédit Mutuel de Bretagne",
-                    "amenity": "bank"
+                    "name": "Chevron",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Crédit Mutuel de Bretagne",
-                "icon": "bank",
+                "name": "Chevron",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Crédit du Nord": {
+            "amenity/fuel/ТНК": {
                 "tags": {
                 "tags": {
-                    "name": "Crédit du Nord",
-                    "amenity": "bank"
+                    "name": "ТНК",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Crédit du Nord",
-                "icon": "bank",
+                "name": "ТНК",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Danske Bank": {
+            "amenity/fuel/REPSOL": {
                 "tags": {
                 "tags": {
-                    "name": "Danske Bank",
-                    "amenity": "bank"
+                    "name": "REPSOL",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Danske Bank",
-                "icon": "bank",
+                "name": "REPSOL",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Davivienda": {
+            "amenity/fuel/MOL": {
                 "tags": {
                 "tags": {
-                    "name": "Davivienda",
-                    "amenity": "bank"
+                    "name": "MOL",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Davivienda",
-                "icon": "bank",
+                "name": "MOL",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/De Venezuela": {
+            "amenity/fuel/Bliska": {
                 "tags": {
                 "tags": {
-                    "name": "De Venezuela",
-                    "amenity": "bank"
+                    "name": "Bliska",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "De Venezuela",
-                "icon": "bank",
+                "name": "Bliska",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Del Tesoro": {
+            "amenity/fuel/Api": {
                 "tags": {
                 "tags": {
-                    "name": "Del Tesoro",
-                    "amenity": "bank"
+                    "name": "Api",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Del Tesoro",
-                "icon": "bank",
+                "name": "Api",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Deutsche Bank": {
+            "amenity/fuel/Arco": {
                 "tags": {
                 "tags": {
-                    "name": "Deutsche Bank",
-                    "amenity": "bank"
+                    "name": "Arco",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Deutsche Bank",
-                "icon": "bank",
+                "name": "Arco",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Dresdner Bank": {
+            "amenity/fuel/Pemex": {
                 "tags": {
                 "tags": {
-                    "name": "Dresdner Bank",
-                    "amenity": "bank"
+                    "name": "Pemex",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Dresdner Bank",
-                "icon": "bank",
+                "name": "Pemex",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Ecobank": {
+            "amenity/fuel/Exxon": {
                 "tags": {
                 "tags": {
-                    "name": "Ecobank",
-                    "amenity": "bank"
+                    "name": "Exxon",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Ecobank",
-                "icon": "bank",
+                "name": "Exxon",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Erste Bank": {
+            "amenity/fuel/Coles Express": {
                 "tags": {
                 "tags": {
-                    "name": "Erste Bank",
-                    "amenity": "bank"
+                    "name": "Coles Express",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Erste Bank",
-                "icon": "bank",
+                "name": "Coles Express",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Eurobank": {
+            "amenity/fuel/Petrom": {
                 "tags": {
                 "tags": {
-                    "name": "Eurobank",
-                    "amenity": "bank"
+                    "name": "Petrom",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Eurobank",
-                "icon": "bank",
+                "name": "Petrom",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/FNB": {
+            "amenity/fuel/PETRONOR": {
                 "tags": {
                 "tags": {
-                    "name": "FNB",
-                    "amenity": "bank"
+                    "name": "PETRONOR",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "FNB",
-                "icon": "bank",
+                "name": "PETRONOR",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Fifth Third Bank": {
+            "amenity/fuel/Rompetrol": {
                 "tags": {
                 "tags": {
-                    "name": "Fifth Third Bank",
-                    "amenity": "bank"
+                    "name": "Rompetrol",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Fifth Third Bank",
-                "icon": "bank",
+                "name": "Rompetrol",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/First National Bank": {
+            "amenity/fuel/Lotos": {
                 "tags": {
                 "tags": {
-                    "name": "First National Bank",
-                    "amenity": "bank"
+                    "name": "Lotos",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "First National Bank",
-                "icon": "bank",
+                "name": "Lotos",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/GE Money Bank": {
+            "amenity/fuel/ОМВ": {
                 "tags": {
                 "tags": {
-                    "name": "GE Money Bank",
-                    "amenity": "bank"
+                    "name": "ОМВ",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "GE Money Bank",
-                "icon": "bank",
+                "name": "ОМВ",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/HDFC Bank": {
+            "amenity/fuel/BR": {
                 "tags": {
                 "tags": {
-                    "name": "HDFC Bank",
-                    "amenity": "bank"
+                    "name": "BR",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "HDFC Bank",
-                "icon": "bank",
+                "name": "BR",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/HSBC": {
+            "amenity/fuel/Copec": {
                 "tags": {
                 "tags": {
-                    "name": "HSBC",
-                    "amenity": "bank"
+                    "name": "Copec",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "HSBC",
-                "icon": "bank",
+                "name": "Copec",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Halifax": {
+            "amenity/fuel/Petrobras": {
                 "tags": {
                 "tags": {
-                    "name": "Halifax",
-                    "amenity": "bank"
+                    "name": "Petrobras",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Halifax",
-                "icon": "bank",
+                "name": "Petrobras",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Hamburger Sparkasse": {
+            "amenity/fuel/Liberty": {
                 "tags": {
                 "tags": {
-                    "name": "Hamburger Sparkasse",
-                    "amenity": "bank"
+                    "name": "Liberty",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Hamburger Sparkasse",
-                "icon": "bank",
+                "name": "Liberty",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Handelsbanken": {
+            "amenity/fuel/IP": {
                 "tags": {
                 "tags": {
-                    "name": "Handelsbanken",
-                    "amenity": "bank"
+                    "name": "IP",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Handelsbanken",
-                "icon": "bank",
+                "name": "IP",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/HypoVereinsbank": {
+            "amenity/fuel/YPF": {
                 "tags": {
                 "tags": {
-                    "name": "HypoVereinsbank",
-                    "amenity": "bank"
+                    "name": "YPF",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "HypoVereinsbank",
-                "icon": "bank",
+                "name": "YPF",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ICICI Bank": {
+            "amenity/fuel/Erg": {
                 "tags": {
                 "tags": {
-                    "name": "ICICI Bank",
-                    "amenity": "bank"
+                    "name": "Erg",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "ICICI Bank",
-                "icon": "bank",
+                "name": "Erg",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ING": {
+            "amenity/fuel/Eneos": {
                 "tags": {
                 "tags": {
-                    "name": "ING",
-                    "amenity": "bank"
+                    "name": "Eneos",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "ING",
-                "icon": "bank",
+                "name": "Eneos",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ING Bank Śląski": {
+            "amenity/fuel/Citgo": {
                 "tags": {
                 "tags": {
-                    "name": "ING Bank Śląski",
-                    "amenity": "bank"
+                    "name": "Citgo",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "ING Bank Śląski",
-                "icon": "bank",
+                "name": "Citgo",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Ibercaja": {
+            "amenity/fuel/Metano": {
                 "tags": {
                 "tags": {
-                    "name": "Ibercaja",
-                    "amenity": "bank"
+                    "name": "Metano",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Ibercaja",
-                "icon": "bank",
+                "name": "Metano",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Intesa San Paolo": {
+            "amenity/fuel/Сургутнефтегаз": {
                 "tags": {
                 "tags": {
-                    "name": "Intesa San Paolo",
-                    "amenity": "bank"
+                    "name": "Сургутнефтегаз",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Intesa San Paolo",
-                "icon": "bank",
+                "name": "Сургутнефтегаз",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Itaú": {
+            "amenity/fuel/EKO": {
                 "tags": {
                 "tags": {
-                    "name": "Itaú",
-                    "amenity": "bank"
+                    "name": "EKO",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Itaú",
-                "icon": "bank",
+                "name": "EKO",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/KBC": {
+            "amenity/fuel/Eko": {
                 "tags": {
                 "tags": {
-                    "name": "KBC",
-                    "amenity": "bank"
+                    "name": "Eko",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "KBC",
-                "icon": "bank",
+                "name": "Eko",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Key Bank": {
+            "amenity/fuel/Indipend.": {
                 "tags": {
                 "tags": {
-                    "name": "Key Bank",
-                    "amenity": "bank"
+                    "name": "Indipend.",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Key Bank",
-                "icon": "bank",
+                "name": "Indipend.",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Komerční banka": {
+            "amenity/fuel/IES": {
                 "tags": {
                 "tags": {
-                    "name": "Komerční banka",
-                    "amenity": "bank"
+                    "name": "IES",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Komerční banka",
-                "icon": "bank",
+                "name": "IES",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Kreissparkasse": {
+            "amenity/fuel/TotalErg": {
                 "tags": {
                 "tags": {
-                    "name": "Kreissparkasse",
-                    "amenity": "bank"
+                    "name": "TotalErg",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Kreissparkasse",
-                "icon": "bank",
+                "name": "TotalErg",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Kreissparkasse Köln": {
+            "amenity/fuel/Cenex": {
                 "tags": {
                 "tags": {
-                    "name": "Kreissparkasse Köln",
-                    "amenity": "bank"
+                    "name": "Cenex",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Kreissparkasse Köln",
-                "icon": "bank",
+                "name": "Cenex",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/LCL": {
+            "amenity/fuel/ПТК": {
                 "tags": {
                 "tags": {
-                    "name": "LCL",
-                    "amenity": "bank"
+                    "name": "ПТК",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "LCL",
-                "icon": "bank",
+                "name": "ПТК",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/La Banque Postale": {
+            "amenity/fuel/HP": {
                 "tags": {
                 "tags": {
-                    "name": "La Banque Postale",
-                    "amenity": "bank"
+                    "name": "HP",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "La Banque Postale",
-                "icon": "bank",
+                "name": "HP",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/La Caixa": {
+            "amenity/fuel/Phillips 66": {
                 "tags": {
                 "tags": {
-                    "name": "La Caixa",
-                    "amenity": "bank"
+                    "name": "Phillips 66",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "La Caixa",
-                "icon": "bank",
+                "name": "Phillips 66",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Landbank": {
+            "amenity/fuel/CARREFOUR": {
                 "tags": {
                 "tags": {
-                    "name": "Landbank",
-                    "amenity": "bank"
+                    "name": "CARREFOUR",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Landbank",
-                "icon": "bank",
+                "name": "CARREFOUR",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Lloyds Bank": {
+            "amenity/fuel/ERG": {
                 "tags": {
                 "tags": {
-                    "name": "Lloyds Bank",
-                    "amenity": "bank"
+                    "name": "ERG",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Lloyds Bank",
-                "icon": "bank",
+                "name": "ERG",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/M&T Bank": {
+            "amenity/fuel/Speedway": {
                 "tags": {
                 "tags": {
-                    "name": "M&T Bank",
-                    "amenity": "bank"
+                    "name": "Speedway",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "M&T Bank",
-                "icon": "bank",
+                "name": "Speedway",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Maybank": {
+            "amenity/fuel/Benzina": {
                 "tags": {
                 "tags": {
-                    "name": "Maybank",
-                    "amenity": "bank"
+                    "name": "Benzina",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Maybank",
-                "icon": "bank",
+                "name": "Benzina",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Mercantil": {
+            "amenity/fuel/Татнефть": {
                 "tags": {
                 "tags": {
-                    "name": "Mercantil",
-                    "amenity": "bank"
+                    "name": "Татнефть",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Mercantil",
-                "icon": "bank",
+                "name": "Татнефть",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Metrobank": {
+            "amenity/fuel/Terpel": {
                 "tags": {
                 "tags": {
-                    "name": "Metrobank",
-                    "amenity": "bank"
+                    "name": "Terpel",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Metrobank",
-                "icon": "bank",
+                "name": "Terpel",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Millenium Bank": {
+            "amenity/fuel/WOG": {
                 "tags": {
                 "tags": {
-                    "name": "Millenium Bank",
-                    "amenity": "bank"
+                    "name": "WOG",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Millenium Bank",
-                "icon": "bank",
+                "name": "WOG",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Millennium Bank": {
+            "amenity/fuel/Seaoil": {
                 "tags": {
                 "tags": {
-                    "name": "Millennium Bank",
-                    "amenity": "bank"
+                    "name": "Seaoil",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Millennium Bank",
-                "icon": "bank",
+                "name": "Seaoil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Monte dei Paschi di Siena": {
+            "amenity/fuel/АЗС": {
                 "tags": {
                 "tags": {
-                    "name": "Monte dei Paschi di Siena",
-                    "amenity": "bank"
+                    "name": "АЗС",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Monte dei Paschi di Siena",
-                "icon": "bank",
+                "name": "АЗС",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/NAB": {
+            "amenity/fuel/Kwik Trip": {
                 "tags": {
                 "tags": {
-                    "name": "NAB",
-                    "amenity": "bank"
+                    "name": "Kwik Trip",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "NAB",
-                "icon": "bank",
+                "name": "Kwik Trip",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/NatWest": {
+            "amenity/fuel/Wawa": {
                 "tags": {
                 "tags": {
-                    "name": "NatWest",
-                    "amenity": "bank"
+                    "name": "Wawa",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "NatWest",
-                "icon": "bank",
+                "name": "Wawa",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/National Bank": {
+            "amenity/fuel/Pertamina": {
                 "tags": {
                 "tags": {
-                    "name": "National Bank",
-                    "amenity": "bank"
+                    "name": "Pertamina",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "National Bank",
-                "icon": "bank",
+                "name": "Pertamina",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Nationwide": {
+            "amenity/fuel/COSMO": {
                 "tags": {
                 "tags": {
-                    "name": "Nationwide",
-                    "amenity": "bank"
+                    "name": "COSMO",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Nationwide",
-                "icon": "bank",
+                "name": "COSMO",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Nedbank": {
+            "amenity/fuel/Z": {
                 "tags": {
                 "tags": {
-                    "name": "Nedbank",
-                    "amenity": "bank"
+                    "name": "Z",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Nedbank",
-                "icon": "bank",
+                "name": "Z",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Nordea": {
+            "amenity/fuel/Indian Oil": {
                 "tags": {
                 "tags": {
-                    "name": "Nordea",
-                    "amenity": "bank"
+                    "name": "Indian Oil",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Nordea",
-                "icon": "bank",
+                "name": "Indian Oil",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/OLB": {
+            "amenity/fuel/АГЗС": {
                 "tags": {
                 "tags": {
-                    "name": "OLB",
-                    "amenity": "bank"
+                    "name": "АГЗС",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "OLB",
-                "icon": "bank",
+                "name": "АГЗС",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/OTP": {
+            "amenity/fuel/INA": {
                 "tags": {
                 "tags": {
-                    "name": "OTP",
-                    "amenity": "bank"
+                    "name": "INA",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "OTP",
-                "icon": "bank",
+                "name": "INA",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Oberbank": {
+            "amenity/fuel/JOMO": {
                 "tags": {
                 "tags": {
-                    "name": "Oberbank",
-                    "amenity": "bank"
+                    "name": "JOMO",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Oberbank",
-                "icon": "bank",
+                "name": "JOMO",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Oldenburgische Landesbank": {
+            "amenity/fuel/Holiday": {
                 "tags": {
                 "tags": {
-                    "name": "Oldenburgische Landesbank",
-                    "amenity": "bank"
+                    "name": "Holiday",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Oldenburgische Landesbank",
-                "icon": "bank",
+                "name": "Holiday",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Osuuspankki": {
+            "amenity/fuel/IDEMITSU": {
                 "tags": {
                 "tags": {
-                    "name": "Osuuspankki",
-                    "amenity": "bank"
+                    "name": "IDEMITSU",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Osuuspankki",
-                "icon": "bank",
+                "name": "IDEMITSU",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/PKO BP": {
+            "amenity/fuel/ENEOS": {
                 "tags": {
                 "tags": {
-                    "name": "PKO BP",
-                    "amenity": "bank"
+                    "name": "ENEOS",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "PKO BP",
-                "icon": "bank",
+                "name": "ENEOS",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/PNB": {
+            "amenity/fuel/Stacja paliw": {
                 "tags": {
                 "tags": {
-                    "name": "PNB",
-                    "amenity": "bank"
+                    "name": "Stacja paliw",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "PNB",
-                "icon": "bank",
+                "name": "Stacja paliw",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/PNC Bank": {
+            "amenity/fuel/Bharat Petroleum": {
                 "tags": {
                 "tags": {
-                    "name": "PNC Bank",
-                    "amenity": "bank"
+                    "name": "Bharat Petroleum",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "PNC Bank",
-                "icon": "bank",
+                "name": "Bharat Petroleum",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/PSBank": {
+            "amenity/fuel/CAMPSA": {
                 "tags": {
                 "tags": {
-                    "name": "PSBank",
-                    "amenity": "bank"
+                    "name": "CAMPSA",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "PSBank",
-                "icon": "bank",
+                "name": "CAMPSA",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Pekao SA": {
+            "amenity/fuel/Casey's General Store": {
                 "tags": {
                 "tags": {
-                    "name": "Pekao SA",
-                    "amenity": "bank"
+                    "name": "Casey's General Store",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Pekao SA",
-                "icon": "bank",
+                "name": "Casey's General Store",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Peoples Bank": {
+            "amenity/fuel/Kangaroo": {
                 "tags": {
                 "tags": {
-                    "name": "Peoples Bank",
-                    "amenity": "bank"
+                    "name": "Kangaroo",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Peoples Bank",
-                "icon": "bank",
+                "name": "Kangaroo",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Postbank": {
+            "amenity/fuel/Белоруснефть": {
                 "tags": {
                 "tags": {
-                    "name": "Postbank",
-                    "amenity": "bank"
+                    "name": "Белоруснефть",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Postbank",
-                "icon": "bank",
+                "name": "Белоруснефть",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/RBC": {
+            "amenity/fuel/コスモ石油 (COSMO)": {
                 "tags": {
                 "tags": {
-                    "name": "RBC",
-                    "amenity": "bank"
+                    "name": "コスモ石油 (COSMO)",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "RBC",
-                "icon": "bank",
+                "name": "コスモ石油 (COSMO)",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/RBS": {
+            "amenity/fuel/MEROIL": {
                 "tags": {
                 "tags": {
-                    "name": "RBS",
-                    "amenity": "bank"
+                    "name": "MEROIL",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "RBS",
-                "icon": "bank",
+                "name": "MEROIL",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/RCBC": {
+            "amenity/fuel/1-2-3": {
                 "tags": {
                 "tags": {
-                    "name": "RCBC",
-                    "amenity": "bank"
+                    "name": "1-2-3",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "RCBC",
-                "icon": "bank",
+                "name": "1-2-3",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Rabobank": {
+            "amenity/fuel/Conoco": {
                 "tags": {
                 "tags": {
-                    "name": "Rabobank",
-                    "amenity": "bank"
+                    "name": "Conoco",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Rabobank",
-                "icon": "bank",
+                "name": "Conoco",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Raiffeisenbank": {
+            "amenity/fuel/出光": {
                 "tags": {
                 "tags": {
-                    "name": "Raiffeisenbank",
-                    "amenity": "bank"
+                    "name": "出光",
+                    "name:en": "IDEMITSU",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Raiffeisenbank",
-                "icon": "bank",
+                "name": "出光",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Regions Bank": {
+            "amenity/fuel/НК Альянс": {
                 "tags": {
                 "tags": {
-                    "name": "Regions Bank",
-                    "amenity": "bank"
+                    "name": "НК Альянс",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Regions Bank",
-                "icon": "bank",
+                "name": "НК Альянс",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Royal Bank": {
+            "amenity/fuel/Sinclair": {
                 "tags": {
                 "tags": {
-                    "name": "Royal Bank",
-                    "amenity": "bank"
+                    "name": "Sinclair",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Royal Bank",
-                "icon": "bank",
+                "name": "Sinclair",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Royal Bank of Scotland": {
+            "amenity/fuel/SPBU": {
                 "tags": {
                 "tags": {
-                    "name": "Royal Bank of Scotland",
-                    "amenity": "bank"
+                    "name": "SPBU",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Royal Bank of Scotland",
-                "icon": "bank",
+                "name": "SPBU",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/SEB": {
+            "amenity/fuel/Макпетрол": {
                 "tags": {
                 "tags": {
-                    "name": "SEB",
-                    "amenity": "bank"
+                    "name": "Макпетрол",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "SEB",
-                "icon": "bank",
+                "name": "Макпетрол",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Santander": {
+            "amenity/fuel/Circle K": {
                 "tags": {
                 "tags": {
-                    "name": "Santander",
-                    "amenity": "bank"
+                    "name": "Circle K",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Santander",
-                "icon": "bank",
+                "name": "Circle K",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Santander Consumer Bank": {
+            "amenity/fuel/Posto Ipiranga": {
                 "tags": {
                 "tags": {
-                    "name": "Santander Consumer Bank",
-                    "amenity": "bank"
+                    "name": "Posto Ipiranga",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Santander Consumer Bank",
-                "icon": "bank",
+                "name": "Posto Ipiranga",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Santander Totta": {
+            "amenity/fuel/Phoenix": {
                 "tags": {
                 "tags": {
-                    "name": "Santander Totta",
-                    "amenity": "bank"
+                    "name": "Phoenix",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Santander Totta",
-                "icon": "bank",
+                "name": "Phoenix",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Sberbank": {
+            "amenity/fuel/Ipiranga": {
                 "tags": {
                 "tags": {
-                    "name": "Sberbank",
-                    "amenity": "bank"
+                    "name": "Ipiranga",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Sberbank",
-                "icon": "bank",
+                "name": "Ipiranga",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Scotiabank": {
+            "amenity/fuel/OKKO": {
                 "tags": {
                 "tags": {
-                    "name": "Scotiabank",
-                    "amenity": "bank"
+                    "name": "OKKO",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Scotiabank",
-                "icon": "bank",
+                "name": "OKKO",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Security Bank": {
+            "amenity/fuel/ОККО": {
                 "tags": {
                 "tags": {
-                    "name": "Security Bank",
-                    "amenity": "bank"
+                    "name": "ОККО",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Security Bank",
-                "icon": "bank",
+                "name": "ОККО",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Slovenská sporiteľňa": {
+            "amenity/fuel/บางจาก": {
                 "tags": {
                 "tags": {
-                    "name": "Slovenská sporiteľňa",
-                    "amenity": "bank"
+                    "name": "บางจาก",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Slovenská sporiteľňa",
-                "icon": "bank",
+                "name": "บางจาก",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Société Générale": {
+            "amenity/fuel/QuikTrip": {
                 "tags": {
                 "tags": {
-                    "name": "Société Générale",
-                    "amenity": "bank"
+                    "name": "QuikTrip",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Société Générale",
-                "icon": "bank",
+                "name": "QuikTrip",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Sparda-Bank": {
+            "amenity/fuel/Stewart's": {
                 "tags": {
                 "tags": {
-                    "name": "Sparda-Bank",
-                    "amenity": "bank"
+                    "name": "Stewart's",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Sparda-Bank",
-                "icon": "bank",
+                "name": "Stewart's",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Sparkasse": {
+            "amenity/fuel/Posto BR": {
                 "tags": {
                 "tags": {
-                    "name": "Sparkasse",
-                    "amenity": "bank"
+                    "name": "Posto BR",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Sparkasse",
-                "icon": "bank",
+                "name": "Posto BR",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Sparkasse Aachen": {
+            "amenity/fuel/ป ต ท": {
                 "tags": {
                 "tags": {
-                    "name": "Sparkasse Aachen",
-                    "amenity": "bank"
+                    "name": "ป ต ท",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Sparkasse Aachen",
-                "icon": "bank",
+                "name": "ป ต ท",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Sparkasse KölnBonn": {
+            "amenity/fuel/ปตท": {
                 "tags": {
                 "tags": {
-                    "name": "Sparkasse KölnBonn",
-                    "amenity": "bank"
+                    "name": "ปตท",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Sparkasse KölnBonn",
-                "icon": "bank",
+                "name": "ปตท",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Stadtsparkasse": {
+            "amenity/fuel/ANP": {
                 "tags": {
                 "tags": {
-                    "name": "Stadtsparkasse",
-                    "amenity": "bank"
+                    "name": "ANP",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Stadtsparkasse",
-                "icon": "bank",
+                "name": "ANP",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Standard Bank": {
+            "amenity/fuel/Kum & Go": {
                 "tags": {
                 "tags": {
-                    "name": "Standard Bank",
-                    "amenity": "bank"
+                    "name": "Kum & Go",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Standard Bank",
-                "icon": "bank",
+                "name": "Kum & Go",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/State Bank of India": {
+            "amenity/fuel/Sokimex": {
                 "tags": {
                 "tags": {
-                    "name": "State Bank of India",
-                    "amenity": "bank"
+                    "name": "Sokimex",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "State Bank of India",
-                "icon": "bank",
+                "name": "Sokimex",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/SunTrust": {
+            "amenity/fuel/Tela": {
                 "tags": {
                 "tags": {
-                    "name": "SunTrust",
-                    "amenity": "bank"
+                    "name": "Tela",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "SunTrust",
-                "icon": "bank",
+                "name": "Tela",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/SunTrust Bank": {
+            "amenity/fuel/Укрнафта": {
                 "tags": {
                 "tags": {
-                    "name": "SunTrust Bank",
-                    "amenity": "bank"
+                    "name": "Укрнафта",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "SunTrust Bank",
-                "icon": "bank",
+                "name": "Укрнафта",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Swedbank": {
+            "amenity/fuel/Татнефтепродукт": {
                 "tags": {
                 "tags": {
-                    "name": "Swedbank",
-                    "amenity": "bank"
+                    "name": "Татнефтепродукт",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Swedbank",
-                "icon": "bank",
+                "name": "Татнефтепродукт",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/TD Bank": {
+            "amenity/fuel/Afriquia": {
                 "tags": {
                 "tags": {
-                    "name": "TD Bank",
-                    "amenity": "bank"
+                    "name": "Afriquia",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "TD Bank",
-                "icon": "bank",
+                "name": "Afriquia",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/TD Canada Trust": {
+            "amenity/fuel/Murphy USA": {
                 "tags": {
                 "tags": {
-                    "name": "TD Canada Trust",
-                    "amenity": "bank"
+                    "name": "Murphy USA",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "TD Canada Trust",
-                "icon": "bank",
+                "name": "Murphy USA",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/TSB": {
+            "amenity/fuel/昭和シェル (Showa-shell)": {
                 "tags": {
                 "tags": {
-                    "name": "TSB",
-                    "amenity": "bank"
+                    "name": "昭和シェル (Showa-shell)",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "TSB",
-                "icon": "bank",
+                "name": "昭和シェル (Showa-shell)",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Targobank": {
+            "amenity/fuel/CNG": {
                 "tags": {
                 "tags": {
-                    "name": "Targobank",
-                    "amenity": "bank"
+                    "name": "CNG",
+                    "amenity": "fuel"
                 },
                 },
-                "name": "Targobank",
-                "icon": "bank",
+                "name": "CNG",
+                "icon": "fuel",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
-                    "building_area",
-                    "address"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Tatra banka": {
+            "amenity/fast_food/Quick": {
                 "tags": {
                 "tags": {
-                    "name": "Tatra banka",
-                    "amenity": "bank"
+                    "name": "Quick",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Tatra banka",
-                "icon": "bank",
+                "name": "Quick",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/UBS": {
+            "amenity/fast_food/McDonald's": {
                 "tags": {
                 "tags": {
-                    "name": "UBS",
-                    "amenity": "bank"
+                    "name": "McDonald's",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "UBS",
-                "icon": "bank",
+                "name": "McDonald's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/UCPB": {
+            "amenity/fast_food/Burger King": {
                 "tags": {
                 "tags": {
-                    "name": "UCPB",
-                    "amenity": "bank"
+                    "name": "Burger King",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "UCPB",
-                "icon": "bank",
+                "name": "Burger King",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/US Bank": {
+            "amenity/fast_food/Ali Baba": {
                 "tags": {
                 "tags": {
-                    "name": "US Bank",
-                    "amenity": "bank"
+                    "name": "Ali Baba",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "US Bank",
-                "icon": "bank",
+                "name": "Ali Baba",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Ulster Bank": {
+            "amenity/fast_food/Hungry Jacks": {
                 "tags": {
                 "tags": {
-                    "name": "Ulster Bank",
-                    "amenity": "bank"
+                    "name": "Hungry Jacks",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Ulster Bank",
-                "icon": "bank",
+                "name": "Hungry Jacks",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/UniCredit Bank": {
+            "amenity/fast_food/Red Rooster": {
                 "tags": {
                 "tags": {
-                    "name": "UniCredit Bank",
-                    "amenity": "bank"
+                    "name": "Red Rooster",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "UniCredit Bank",
-                "icon": "bank",
+                "name": "Red Rooster",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Unicredit Banca": {
+            "amenity/fast_food/KFC": {
                 "tags": {
                 "tags": {
-                    "name": "Unicredit Banca",
-                    "amenity": "bank"
+                    "name": "KFC",
+                    "cuisine": "chicken",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Unicredit Banca",
-                "icon": "bank",
+                "name": "KFC",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Unicaja": {
+            "amenity/fast_food/Domino's Pizza": {
                 "tags": {
                 "tags": {
-                    "name": "Unicaja",
-                    "amenity": "bank"
+                    "name": "Domino's Pizza",
+                    "cuisine": "pizza",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Unicaja",
-                "icon": "bank",
+                "name": "Domino's Pizza",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Union Bank": {
+            "amenity/fast_food/Chowking": {
                 "tags": {
                 "tags": {
-                    "name": "Union Bank",
-                    "amenity": "bank"
+                    "name": "Chowking",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Union Bank",
-                "icon": "bank",
+                "name": "Chowking",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/VR-Bank": {
+            "amenity/fast_food/Jollibee": {
                 "tags": {
                 "tags": {
-                    "name": "VR-Bank",
-                    "amenity": "bank"
+                    "name": "Jollibee",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "VR-Bank",
-                "icon": "bank",
+                "name": "Jollibee",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Volksbank": {
+            "amenity/fast_food/Hesburger": {
                 "tags": {
                 "tags": {
-                    "name": "Volksbank",
-                    "amenity": "bank"
+                    "name": "Hesburger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Volksbank",
-                "icon": "bank",
+                "name": "Hesburger",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/VÚB": {
+            "amenity/fast_food/肯德基": {
                 "tags": {
                 "tags": {
-                    "name": "VÚB",
-                    "amenity": "bank"
+                    "name": "肯德基",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "VÚB",
-                "icon": "bank",
+                "name": "肯德基",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Wachovia": {
+            "amenity/fast_food/Wendy's": {
                 "tags": {
                 "tags": {
-                    "name": "Wachovia",
-                    "amenity": "bank"
+                    "name": "Wendy's",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Wachovia",
-                "icon": "bank",
+                "name": "Wendy's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Wells Fargo": {
+            "amenity/fast_food/Tim Hortons": {
                 "tags": {
                 "tags": {
-                    "name": "Wells Fargo",
-                    "amenity": "bank"
+                    "name": "Tim Hortons",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Wells Fargo",
-                "icon": "bank",
+                "name": "Tim Hortons",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Western Union": {
+            "amenity/fast_food/Steers": {
                 "tags": {
                 "tags": {
-                    "name": "Western Union",
-                    "amenity": "bank"
+                    "name": "Steers",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Western Union",
-                "icon": "bank",
+                "name": "Steers",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Westpac": {
+            "amenity/fast_food/Hardee's": {
                 "tags": {
                 "tags": {
-                    "name": "Westpac",
-                    "amenity": "bank"
+                    "name": "Hardee's",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Westpac",
-                "icon": "bank",
+                "name": "Hardee's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Yorkshire Bank": {
+            "amenity/fast_food/Arby's": {
                 "tags": {
                 "tags": {
-                    "name": "Yorkshire Bank",
-                    "amenity": "bank"
-                },
-                "name": "Yorkshire Bank",
-                "icon": "bank",
+                    "name": "Arby's",
+                    "amenity": "fast_food"
+                },
+                "name": "Arby's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ČSOB": {
+            "amenity/fast_food/A&W": {
                 "tags": {
                 "tags": {
-                    "name": "ČSOB",
-                    "amenity": "bank"
+                    "name": "A&W",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "ČSOB",
-                "icon": "bank",
+                "name": "A&W",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Česká spořitelna": {
+            "amenity/fast_food/Dairy Queen": {
                 "tags": {
                 "tags": {
-                    "name": "Česká spořitelna",
-                    "amenity": "bank"
+                    "name": "Dairy Queen",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Česká spořitelna",
-                "icon": "bank",
+                "name": "Dairy Queen",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Альфа-Банк": {
+            "amenity/fast_food/Hallo Pizza": {
                 "tags": {
                 "tags": {
-                    "name": "Альфа-Банк",
-                    "amenity": "bank"
+                    "name": "Hallo Pizza",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Альфа-Банк",
-                "icon": "bank",
+                "name": "Hallo Pizza",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Банк Москвы": {
+            "amenity/fast_food/Fish & Chips": {
                 "tags": {
                 "tags": {
-                    "name": "Банк Москвы",
-                    "amenity": "bank"
+                    "name": "Fish & Chips",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Банк Москвы",
-                "icon": "bank",
+                "name": "Fish & Chips",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Белагропромбанк": {
+            "amenity/fast_food/Harvey's": {
                 "tags": {
                 "tags": {
-                    "name": "Белагропромбанк",
-                    "amenity": "bank"
+                    "name": "Harvey's",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Белагропромбанк",
-                "icon": "bank",
+                "name": "Harvey's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Беларусбанк": {
+            "amenity/fast_food/麥當勞": {
                 "tags": {
                 "tags": {
-                    "name": "Беларусбанк",
-                    "amenity": "bank"
+                    "name": "麥當勞",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Беларусбанк",
-                "icon": "bank",
+                "name": "麥當勞",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ВТБ": {
+            "amenity/fast_food/Pizza Pizza": {
                 "tags": {
                 "tags": {
-                    "name": "ВТБ",
-                    "amenity": "bank"
+                    "name": "Pizza Pizza",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "ВТБ",
-                "icon": "bank",
+                "name": "Pizza Pizza",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ВТБ24": {
+            "amenity/fast_food/Kotipizza": {
                 "tags": {
                 "tags": {
-                    "name": "ВТБ24",
-                    "amenity": "bank"
+                    "name": "Kotipizza",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "ВТБ24",
-                "icon": "bank",
+                "name": "Kotipizza",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Возрождение": {
+            "amenity/fast_food/Jack in the Box": {
                 "tags": {
                 "tags": {
-                    "name": "Возрождение",
-                    "amenity": "bank"
+                    "name": "Jack in the Box",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Возрождение",
-                "icon": "bank",
+                "name": "Jack in the Box",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Газпромбанк": {
+            "amenity/fast_food/Istanbul": {
                 "tags": {
                 "tags": {
-                    "name": "Газпромбанк",
-                    "amenity": "bank"
+                    "name": "Istanbul",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Газпромбанк",
-                "icon": "bank",
+                "name": "Istanbul",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Ощадбанк": {
+            "amenity/fast_food/Kochlöffel": {
                 "tags": {
                 "tags": {
-                    "name": "Ощадбанк",
-                    "amenity": "bank"
+                    "name": "Kochlöffel",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Ощадбанк",
-                "icon": "bank",
+                "name": "Kochlöffel",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ПриватБанк": {
+            "amenity/fast_food/Döner": {
                 "tags": {
                 "tags": {
-                    "name": "ПриватБанк",
-                    "amenity": "bank"
+                    "name": "Döner",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "ПриватБанк",
-                "icon": "bank",
+                "name": "Döner",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Промсвязьбанк": {
+            "amenity/fast_food/Telepizza": {
                 "tags": {
                 "tags": {
-                    "name": "Промсвязьбанк",
-                    "amenity": "bank"
+                    "name": "Telepizza",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Промсвязьбанк",
-                "icon": "bank",
+                "name": "Telepizza",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Райффайзен Банк Аваль": {
+            "amenity/fast_food/Sibylla": {
                 "tags": {
                 "tags": {
-                    "name": "Райффайзен Банк Аваль",
-                    "amenity": "bank"
+                    "name": "Sibylla",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Райффайзен Банк Аваль",
-                "icon": "bank",
+                "name": "Sibylla",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Росбанк": {
+            "amenity/fast_food/Carl's Jr.": {
                 "tags": {
                 "tags": {
-                    "name": "Росбанк",
-                    "amenity": "bank"
+                    "name": "Carl's Jr.",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Росбанк",
-                "icon": "bank",
+                "name": "Carl's Jr.",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Россельхозбанк": {
+            "amenity/fast_food/Quiznos": {
                 "tags": {
                 "tags": {
-                    "name": "Россельхозбанк",
-                    "amenity": "bank"
+                    "name": "Quiznos",
+                    "cuisine": "sandwich",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Россельхозбанк",
-                "icon": "bank",
+                "name": "Quiznos",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Сбербанк": {
+            "amenity/fast_food/Wimpy": {
                 "tags": {
                 "tags": {
-                    "name": "Сбербанк",
-                    "amenity": "bank"
+                    "name": "Wimpy",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Сбербанк",
-                "icon": "bank",
+                "name": "Wimpy",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Совкомбанк": {
+            "amenity/fast_food/Sonic": {
                 "tags": {
                 "tags": {
-                    "name": "Совкомбанк",
-                    "amenity": "bank"
+                    "name": "Sonic",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Совкомбанк",
-                "icon": "bank",
+                "name": "Sonic",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/УкрСиббанк": {
+            "amenity/fast_food/Taco Bell": {
                 "tags": {
                 "tags": {
-                    "name": "УкрСиббанк",
-                    "amenity": "bank"
+                    "name": "Taco Bell",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "УкрСиббанк",
-                "icon": "bank",
+                "name": "Taco Bell",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/Уралсиб": {
+            "amenity/fast_food/Pizza Nova": {
                 "tags": {
                 "tags": {
-                    "name": "Уралсиб",
-                    "amenity": "bank"
+                    "name": "Pizza Nova",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Уралсиб",
-                "icon": "bank",
+                "name": "Pizza Nova",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/ლიბერთი ბანკი": {
+            "amenity/fast_food/Papa John's": {
                 "tags": {
                 "tags": {
-                    "name": "ლიბერთი ბანკი",
-                    "name:en": "Liberty Bank",
-                    "amenity": "bank"
+                    "name": "Papa John's",
+                    "cuisine": "pizza",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "ლიბერთი ბანკი",
-                "icon": "bank",
+                "name": "Papa John's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/みずほ銀行": {
+            "amenity/fast_food/Nordsee": {
                 "tags": {
                 "tags": {
-                    "name": "みずほ銀行",
-                    "amenity": "bank"
+                    "name": "Nordsee",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "みずほ銀行",
-                "icon": "bank",
+                "name": "Nordsee",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/りそな銀行": {
+            "amenity/fast_food/Mr. Sub": {
                 "tags": {
                 "tags": {
-                    "name": "りそな銀行",
-                    "name:en": "Mizuho Bank",
-                    "amenity": "bank"
+                    "name": "Mr. Sub",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "りそな銀行",
-                "icon": "bank",
+                "name": "Mr. Sub",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/三井住友銀行": {
+            "amenity/fast_food/Kebab": {
                 "tags": {
                 "tags": {
-                    "name": "三井住友銀行",
-                    "amenity": "bank"
+                    "name": "Kebab",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "三井住友銀行",
-                "icon": "bank",
+                "name": "Kebab",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/三菱東京UFJ銀行": {
+            "amenity/fast_food/Макдоналдс": {
                 "tags": {
                 "tags": {
-                    "name": "三菱東京UFJ銀行",
-                    "amenity": "bank"
+                    "name": "Макдоналдс",
+                    "name:en": "McDonald's",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "三菱東京UFJ銀行",
-                "icon": "bank",
+                "name": "Макдоналдс",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/中国银行": {
+            "amenity/fast_food/Asia Imbiss": {
                 "tags": {
                 "tags": {
-                    "name": "中国银行",
-                    "amenity": "bank"
+                    "name": "Asia Imbiss",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "中国银行",
-                "icon": "bank",
+                "name": "Asia Imbiss",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/광주은행": {
+            "amenity/fast_food/Imbiss": {
                 "tags": {
                 "tags": {
-                    "name": "광주은행",
-                    "name:en": "Gwangju Bank",
-                    "amenity": "bank"
+                    "name": "Imbiss",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "광주은행",
-                "icon": "bank",
+                "name": "Imbiss",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/국민은행": {
+            "amenity/fast_food/Chipotle": {
                 "tags": {
                 "tags": {
-                    "name": "국민은행",
-                    "name:en": "Gungmin Bank",
-                    "amenity": "bank"
+                    "name": "Chipotle",
+                    "cuisine": "mexican",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "국민은행",
-                "icon": "bank",
+                "name": "Chipotle",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/농협": {
+            "amenity/fast_food/マクドナルド": {
                 "tags": {
                 "tags": {
-                    "name": "농협",
-                    "amenity": "bank"
+                    "name": "マクドナルド",
+                    "name:en": "McDonald's",
+                    "cuisine": "burger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "농협",
-                "icon": "bank",
+                "name": "マクドナルド",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/신한은행": {
+            "amenity/fast_food/In-N-Out Burger": {
                 "tags": {
                 "tags": {
-                    "name": "신한은행",
-                    "name:en": "Sinhan Bank",
-                    "amenity": "bank"
+                    "name": "In-N-Out Burger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "신한은행",
-                "icon": "bank",
+                "name": "In-N-Out Burger",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/우리은행": {
+            "amenity/fast_food/Jimmy John's": {
                 "tags": {
                 "tags": {
-                    "name": "우리은행",
-                    "name:en": "Uri Bank",
-                    "amenity": "bank"
+                    "name": "Jimmy John's",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "우리은행",
-                "icon": "bank",
+                "name": "Jimmy John's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/중소기업은행": {
+            "amenity/fast_food/Jamba Juice": {
                 "tags": {
                 "tags": {
-                    "name": "중소기업은행",
-                    "name:en": "Industrial Bank of Korea",
-                    "amenity": "bank"
+                    "name": "Jamba Juice",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "중소기업은행",
-                "icon": "bank",
+                "name": "Jamba Juice",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/bank/하나은행": {
+            "amenity/fast_food/Робин Сдобин": {
                 "tags": {
                 "tags": {
-                    "name": "하나은행",
-                    "amenity": "bank"
+                    "name": "Робин Сдобин",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "하나은행",
-                "icon": "bank",
+                "name": "Робин Сдобин",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "atm",
+                    "cuisine",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Cafe Amazon": {
+            "amenity/fast_food/Baskin Robbins": {
                 "tags": {
                 "tags": {
-                    "name": "Cafe Amazon",
-                    "amenity": "cafe"
+                    "name": "Baskin Robbins",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Cafe Amazon",
-                "icon": "cafe",
+                "name": "Baskin Robbins",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -71955,19 +75332,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Cafe Coffee Day": {
+            "amenity/fast_food/ケンタッキーフライドチキン": {
                 "tags": {
                 "tags": {
-                    "name": "Cafe Coffee Day",
-                    "amenity": "cafe"
+                    "name": "ケンタッキーフライドチキン",
+                    "name:en": "KFC",
+                    "cuisine": "chicken",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Cafe Coffee Day",
-                "icon": "cafe",
+                "name": "ケンタッキーフライドチキン",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -71975,19 +75354,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Cafeteria": {
+            "amenity/fast_food/吉野家": {
                 "tags": {
                 "tags": {
-                    "name": "Cafeteria",
-                    "amenity": "cafe"
+                    "name": "吉野家",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Cafeteria",
-                "icon": "cafe",
+                "name": "吉野家",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -71995,19 +75374,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Caffè Nero": {
+            "amenity/fast_food/Taco Time": {
                 "tags": {
                 "tags": {
-                    "name": "Caffè Nero",
-                    "amenity": "cafe"
+                    "name": "Taco Time",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Caffè Nero",
-                "icon": "cafe",
+                "name": "Taco Time",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72015,19 +75394,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Café Central": {
+            "amenity/fast_food/松屋": {
                 "tags": {
                 "tags": {
-                    "name": "Café Central",
-                    "amenity": "cafe"
+                    "name": "松屋",
+                    "name:en": "Matsuya",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Café Central",
-                "icon": "cafe",
+                "name": "松屋",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72035,19 +75415,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Caribou Coffee": {
+            "amenity/fast_food/Little Caesars": {
                 "tags": {
                 "tags": {
-                    "name": "Caribou Coffee",
-                    "amenity": "cafe"
+                    "name": "Little Caesars",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Caribou Coffee",
-                "icon": "cafe",
+                "name": "Little Caesars",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72055,19 +75435,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Coffee Time": {
+            "amenity/fast_food/El Pollo Loco": {
                 "tags": {
                 "tags": {
-                    "name": "Coffee Time",
-                    "amenity": "cafe"
+                    "name": "El Pollo Loco",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Coffee Time",
-                "icon": "cafe",
+                "name": "El Pollo Loco",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72075,19 +75455,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Costa": {
+            "amenity/fast_food/Del Taco": {
                 "tags": {
                 "tags": {
-                    "name": "Costa",
-                    "amenity": "cafe"
+                    "name": "Del Taco",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Costa",
-                "icon": "cafe",
+                "name": "Del Taco",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72095,20 +75475,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Dunkin Donuts": {
+            "amenity/fast_food/White Castle": {
                 "tags": {
                 "tags": {
-                    "name": "Dunkin Donuts",
-                    "cuisine": "donut",
-                    "amenity": "cafe"
+                    "name": "White Castle",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Dunkin Donuts",
-                "icon": "cafe",
+                "name": "White Castle",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72116,19 +75495,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Eiscafe": {
+            "amenity/fast_food/Boston Market": {
                 "tags": {
                 "tags": {
-                    "name": "Eiscafe",
-                    "amenity": "cafe"
+                    "name": "Boston Market",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Eiscafe",
-                "icon": "cafe",
+                "name": "Boston Market",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72136,19 +75515,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Eiscafe Venezia": {
+            "amenity/fast_food/Chick-fil-A": {
                 "tags": {
                 "tags": {
-                    "name": "Eiscafe Venezia",
-                    "amenity": "cafe"
+                    "name": "Chick-fil-A",
+                    "cuisine": "chicken",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Eiscafe Venezia",
-                "icon": "cafe",
+                "name": "Chick-fil-A",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72156,19 +75536,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Eisdiele": {
+            "amenity/fast_food/Panda Express": {
                 "tags": {
                 "tags": {
-                    "name": "Eisdiele",
-                    "amenity": "cafe"
+                    "name": "Panda Express",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Eisdiele",
-                "icon": "cafe",
+                "name": "Panda Express",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72176,19 +75556,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Pret A Manger": {
+            "amenity/fast_food/Whataburger": {
                 "tags": {
                 "tags": {
-                    "name": "Pret A Manger",
-                    "amenity": "cafe"
+                    "name": "Whataburger",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Pret A Manger",
-                "icon": "cafe",
+                "name": "Whataburger",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72196,19 +75576,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Second Cup": {
+            "amenity/fast_food/Taco John's": {
                 "tags": {
                 "tags": {
-                    "name": "Second Cup",
-                    "amenity": "cafe"
+                    "name": "Taco John's",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Second Cup",
-                "icon": "cafe",
+                "name": "Taco John's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72216,19 +75596,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Segafredo": {
+            "amenity/fast_food/Теремок": {
                 "tags": {
                 "tags": {
-                    "name": "Segafredo",
-                    "amenity": "cafe"
+                    "name": "Теремок",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Segafredo",
-                "icon": "cafe",
+                "name": "Теремок",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72236,20 +75616,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Starbucks": {
+            "amenity/fast_food/Culver's": {
                 "tags": {
                 "tags": {
-                    "name": "Starbucks",
-                    "cuisine": "coffee_shop",
-                    "amenity": "cafe"
+                    "name": "Culver's",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Starbucks",
-                "icon": "cafe",
+                "name": "Culver's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72257,19 +75636,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Tchibo": {
+            "amenity/fast_food/Five Guys": {
                 "tags": {
                 "tags": {
-                    "name": "Tchibo",
-                    "amenity": "cafe"
+                    "name": "Five Guys",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Tchibo",
-                "icon": "cafe",
+                "name": "Five Guys",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72277,19 +75656,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Traveler's Coffee": {
+            "amenity/fast_food/Church's Chicken": {
                 "tags": {
                 "tags": {
-                    "name": "Traveler's Coffee",
-                    "amenity": "cafe"
+                    "name": "Church's Chicken",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Traveler's Coffee",
-                "icon": "cafe",
+                "name": "Church's Chicken",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72297,19 +75676,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Кафе": {
+            "amenity/fast_food/Popeye's": {
                 "tags": {
                 "tags": {
-                    "name": "Кафе",
-                    "amenity": "cafe"
+                    "name": "Popeye's",
+                    "cuisine": "chicken",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Кафе",
-                "icon": "cafe",
+                "name": "Popeye's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72317,19 +75697,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Кофе Хауз": {
+            "amenity/fast_food/Long John Silver's": {
                 "tags": {
                 "tags": {
-                    "name": "Кофе Хауз",
-                    "amenity": "cafe"
+                    "name": "Long John Silver's",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Кофе Хауз",
-                "icon": "cafe",
+                "name": "Long John Silver's",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72337,19 +75717,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Столовая": {
+            "amenity/fast_food/Pollo Campero": {
                 "tags": {
                 "tags": {
-                    "name": "Столовая",
-                    "amenity": "cafe"
+                    "name": "Pollo Campero",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Столовая",
-                "icon": "cafe",
+                "name": "Pollo Campero",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72357,19 +75737,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Шашлычная": {
+            "amenity/fast_food/すき家": {
                 "tags": {
                 "tags": {
-                    "name": "Шашлычная",
-                    "amenity": "cafe"
+                    "name": "すき家",
+                    "name:en": "SUKIYA",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Шашлычная",
-                "icon": "cafe",
+                "name": "すき家",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72377,19 +75758,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/Шоколадница": {
+            "amenity/fast_food/モスバーガー": {
                 "tags": {
                 "tags": {
-                    "name": "Шоколадница",
-                    "amenity": "cafe"
+                    "name": "モスバーガー",
+                    "name:en": "MOS BURGER",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "Шоколадница",
-                "icon": "cafe",
+                "name": "モスバーガー",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72397,19 +75779,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/คาเฟ่ อเมซอน": {
+            "amenity/fast_food/Русский Аппетит": {
                 "tags": {
                 "tags": {
-                    "name": "คาเฟ่ อเมซอน",
-                    "amenity": "cafe"
+                    "name": "Русский Аппетит",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "คาเฟ่ อเมซอน",
-                "icon": "cafe",
+                "name": "Русский Аппетит",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72417,20 +75799,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/カフェ・ド・クリエ": {
+            "amenity/fast_food/なか卯": {
                 "tags": {
                 "tags": {
-                    "name": "カフェ・ド・クリエ",
-                    "name:en": "Cafe de CRIE",
-                    "amenity": "cafe"
+                    "name": "なか卯",
+                    "amenity": "fast_food"
                 },
                 },
-                "name": "ã\82«ã\83\95ã\82§ã\83»ã\83\89ã\83»ã\82¯ã\83ªã\82¨",
-                "icon": "cafe",
+                "name": "ã\81ªã\81\8bå\8d¯",
+                "icon": "fast-food",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72438,20 +75819,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/スターバックス": {
+            "amenity/restaurant/Pizza Hut": {
                 "tags": {
                 "tags": {
-                    "name": "スターバックス",
-                    "name:en": "Starbucks",
-                    "amenity": "cafe"
+                    "name": "Pizza Hut",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "スターバックス",
-                "icon": "cafe",
+                "name": "Pizza Hut",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72459,20 +75839,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/cafe/ドトール": {
+            "amenity/restaurant/Little Chef": {
                 "tags": {
                 "tags": {
-                    "name": "ドトール",
-                    "name:en": "DOUTOR",
-                    "amenity": "cafe"
+                    "name": "Little Chef",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "ドトール",
-                "icon": "cafe",
+                "name": "Little Chef",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72480,131 +75860,167 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
-                    "internet_access",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Avis": {
+            "amenity/restaurant/Adler": {
                 "tags": {
                 "tags": {
-                    "name": "Avis",
-                    "amenity": "car_rental"
+                    "name": "Adler",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Avis",
-                "icon": "car",
+                "name": "Adler",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Budget": {
+            "amenity/restaurant/Zur Krone": {
                 "tags": {
                 "tags": {
-                    "name": "Budget",
-                    "amenity": "car_rental"
+                    "name": "Zur Krone",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Budget",
-                "icon": "car",
+                "name": "Zur Krone",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Enterprise": {
+            "amenity/restaurant/Deutsches Haus": {
                 "tags": {
                 "tags": {
-                    "name": "Enterprise",
-                    "amenity": "car_rental"
+                    "name": "Deutsches Haus",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Enterprise",
-                "icon": "car",
+                "name": "Deutsches Haus",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Europcar": {
+            "amenity/restaurant/Krone": {
                 "tags": {
                 "tags": {
-                    "name": "Europcar",
-                    "amenity": "car_rental"
+                    "name": "Krone",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Europcar",
-                "icon": "car",
+                "name": "Krone",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Hertz": {
+            "amenity/restaurant/Akropolis": {
                 "tags": {
                 "tags": {
-                    "name": "Hertz",
-                    "amenity": "car_rental"
+                    "name": "Akropolis",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Hertz",
-                "icon": "car",
+                "name": "Akropolis",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/Sixt": {
+            "amenity/restaurant/Schützenhaus": {
                 "tags": {
                 "tags": {
-                    "name": "Sixt",
-                    "amenity": "car_rental"
+                    "name": "Schützenhaus",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Sixt",
-                "icon": "car",
+                "name": "Schützenhaus",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/car_rental/stadtmobil CarSharing-Station": {
+            "amenity/restaurant/TGI Friday's": {
                 "tags": {
                 "tags": {
-                    "name": "stadtmobil CarSharing-Station",
-                    "amenity": "car_rental"
+                    "name": "TGI Friday's",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "stadtmobil CarSharing-Station",
-                "icon": "car",
+                "name": "TGI Friday's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "operator"
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/A&W": {
+            "amenity/restaurant/Kreuz": {
                 "tags": {
                 "tags": {
-                    "name": "A&W",
-                    "amenity": "fast_food"
+                    "name": "Kreuz",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "A&W",
-                "icon": "fast-food",
+                "name": "Kreuz",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72613,17 +76029,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Ali Baba": {
+            "amenity/restaurant/Waldschänke": {
                 "tags": {
                 "tags": {
-                    "name": "Ali Baba",
-                    "amenity": "fast_food"
+                    "name": "Waldschänke",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Ali Baba",
-                "icon": "fast-food",
+                "name": "Waldschänke",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72632,17 +76050,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Arby's": {
+            "amenity/restaurant/La Piazza": {
                 "tags": {
                 "tags": {
-                    "name": "Arby's",
-                    "amenity": "fast_food"
+                    "name": "La Piazza",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Arby's",
-                "icon": "fast-food",
+                "name": "La Piazza",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72651,17 +76071,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Asia Imbiss": {
+            "amenity/restaurant/Lamm": {
                 "tags": {
                 "tags": {
-                    "name": "Asia Imbiss",
-                    "amenity": "fast_food"
+                    "name": "Lamm",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Asia Imbiss",
-                "icon": "fast-food",
+                "name": "Lamm",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72670,17 +76092,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Baskin Robbins": {
+            "amenity/restaurant/Zur Sonne": {
                 "tags": {
                 "tags": {
-                    "name": "Baskin Robbins",
-                    "amenity": "fast_food"
+                    "name": "Zur Sonne",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Baskin Robbins",
-                "icon": "fast-food",
+                "name": "Zur Sonne",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72689,17 +76113,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Boston Market": {
+            "amenity/restaurant/Zur Linde": {
                 "tags": {
                 "tags": {
-                    "name": "Boston Market",
-                    "amenity": "fast_food"
+                    "name": "Zur Linde",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Boston Market",
-                "icon": "fast-food",
+                "name": "Zur Linde",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72708,18 +76134,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Burger King": {
+            "amenity/restaurant/Poseidon": {
                 "tags": {
                 "tags": {
-                    "name": "Burger King",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Poseidon",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Burger King",
-                "icon": "fast-food",
+                "name": "Poseidon",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72728,18 +76155,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Carl's Jr.": {
+            "amenity/restaurant/Shanghai": {
                 "tags": {
                 "tags": {
-                    "name": "Carl's Jr.",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Shanghai",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Carl's Jr.",
-                "icon": "fast-food",
+                "name": "Shanghai",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72748,18 +76176,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Chick-fil-A": {
+            "amenity/restaurant/Red Lobster": {
                 "tags": {
                 "tags": {
-                    "name": "Chick-fil-A",
-                    "cuisine": "chicken",
-                    "amenity": "fast_food"
+                    "name": "Red Lobster",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Chick-fil-A",
-                "icon": "fast-food",
+                "name": "Red Lobster",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72768,18 +76197,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Chipotle": {
+            "amenity/restaurant/Zum Löwen": {
                 "tags": {
                 "tags": {
-                    "name": "Chipotle",
-                    "cuisine": "mexican",
-                    "amenity": "fast_food"
+                    "name": "Zum Löwen",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Chipotle",
-                "icon": "fast-food",
+                "name": "Zum Löwen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72788,17 +76218,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Chowking": {
+            "amenity/restaurant/Swiss Chalet": {
                 "tags": {
                 "tags": {
-                    "name": "Chowking",
-                    "amenity": "fast_food"
+                    "name": "Swiss Chalet",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Chowking",
-                "icon": "fast-food",
+                "name": "Swiss Chalet",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72807,17 +76239,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Church's Chicken": {
+            "amenity/restaurant/Olympia": {
                 "tags": {
                 "tags": {
-                    "name": "Church's Chicken",
-                    "amenity": "fast_food"
+                    "name": "Olympia",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Church's Chicken",
-                "icon": "fast-food",
+                "name": "Olympia",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72826,17 +76260,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Culver's": {
+            "amenity/restaurant/Wagamama": {
                 "tags": {
                 "tags": {
-                    "name": "Culver's",
-                    "amenity": "fast_food"
+                    "name": "Wagamama",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Culver's",
-                "icon": "fast-food",
+                "name": "Wagamama",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72845,17 +76281,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Dairy Queen": {
+            "amenity/restaurant/Frankie & Benny's": {
                 "tags": {
                 "tags": {
-                    "name": "Dairy Queen",
-                    "amenity": "fast_food"
+                    "name": "Frankie & Benny's",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Dairy Queen",
-                "icon": "fast-food",
+                "name": "Frankie & Benny's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72864,17 +76302,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Del Taco": {
+            "amenity/restaurant/Hooters": {
                 "tags": {
                 "tags": {
-                    "name": "Del Taco",
-                    "amenity": "fast_food"
+                    "name": "Hooters",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Del Taco",
-                "icon": "fast-food",
+                "name": "Hooters",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72883,18 +76323,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Domino's Pizza": {
+            "amenity/restaurant/Sternen": {
                 "tags": {
                 "tags": {
-                    "name": "Domino's Pizza",
-                    "cuisine": "pizza",
-                    "amenity": "fast_food"
+                    "name": "Sternen",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Domino's Pizza",
-                "icon": "fast-food",
+                "name": "Sternen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72903,17 +76344,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Döner": {
+            "amenity/restaurant/Hirschen": {
                 "tags": {
                 "tags": {
-                    "name": "Döner",
-                    "amenity": "fast_food"
+                    "name": "Hirschen",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Döner",
-                "icon": "fast-food",
+                "name": "Hirschen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72922,17 +76365,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/El Pollo Loco": {
+            "amenity/restaurant/Denny's": {
                 "tags": {
                 "tags": {
-                    "name": "El Pollo Loco",
-                    "amenity": "fast_food"
+                    "name": "Denny's",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "El Pollo Loco",
-                "icon": "fast-food",
+                "name": "Denny's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72941,17 +76386,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Fish & Chips": {
+            "amenity/restaurant/Athen": {
                 "tags": {
                 "tags": {
-                    "name": "Fish & Chips",
-                    "amenity": "fast_food"
+                    "name": "Athen",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Fish & Chips",
-                "icon": "fast-food",
+                "name": "Athen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72960,17 +76407,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Five Guys": {
+            "amenity/restaurant/Sonne": {
                 "tags": {
                 "tags": {
-                    "name": "Five Guys",
-                    "amenity": "fast_food"
+                    "name": "Sonne",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Five Guys",
-                "icon": "fast-food",
+                "name": "Sonne",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72979,17 +76428,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Hallo Pizza": {
+            "amenity/restaurant/Hirsch": {
                 "tags": {
                 "tags": {
-                    "name": "Hallo Pizza",
-                    "amenity": "fast_food"
+                    "name": "Hirsch",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Hallo Pizza",
-                "icon": "fast-food",
+                "name": "Hirsch",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -72998,18 +76449,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Hardee's": {
+            "amenity/restaurant/Ratskeller": {
                 "tags": {
                 "tags": {
-                    "name": "Hardee's",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Ratskeller",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Hardee's",
-                "icon": "fast-food",
+                "name": "Ratskeller",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73018,17 +76470,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Harvey's": {
+            "amenity/restaurant/La Cantina": {
                 "tags": {
                 "tags": {
-                    "name": "Harvey's",
-                    "amenity": "fast_food"
+                    "name": "La Cantina",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Harvey's",
-                "icon": "fast-food",
+                "name": "La Cantina",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73037,17 +76491,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Hesburger": {
+            "amenity/restaurant/Gasthaus Krone": {
                 "tags": {
                 "tags": {
-                    "name": "Hesburger",
-                    "amenity": "fast_food"
+                    "name": "Gasthaus Krone",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Hesburger",
-                "icon": "fast-food",
+                "name": "Gasthaus Krone",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73056,18 +76512,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Hungry Jacks": {
+            "amenity/restaurant/El Greco": {
                 "tags": {
                 "tags": {
-                    "name": "Hungry Jacks",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "El Greco",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Hungry Jacks",
-                "icon": "fast-food",
+                "name": "El Greco",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73076,17 +76533,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Imbiss": {
+            "amenity/restaurant/Gasthof zur Post": {
                 "tags": {
                 "tags": {
-                    "name": "Imbiss",
-                    "amenity": "fast_food"
+                    "name": "Gasthof zur Post",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Imbiss",
-                "icon": "fast-food",
+                "name": "Gasthof zur Post",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73095,17 +76554,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/In-N-Out Burger": {
+            "amenity/restaurant/Nando's": {
                 "tags": {
                 "tags": {
-                    "name": "In-N-Out Burger",
-                    "amenity": "fast_food"
+                    "name": "Nando's",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "In-N-Out Burger",
-                "icon": "fast-food",
+                "name": "Nando's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73114,17 +76575,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Istanbul": {
+            "amenity/restaurant/Löwen": {
                 "tags": {
                 "tags": {
-                    "name": "Istanbul",
-                    "amenity": "fast_food"
+                    "name": "Löwen",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Istanbul",
-                "icon": "fast-food",
+                "name": "Löwen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73133,18 +76596,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Jack in the Box": {
+            "amenity/restaurant/Pizza Express": {
                 "tags": {
                 "tags": {
-                    "name": "Jack in the Box",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Pizza Express",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Jack in the Box",
-                "icon": "fast-food",
+                "name": "Pizza Express",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73153,17 +76617,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Jamba Juice": {
+            "amenity/restaurant/Mandarin": {
                 "tags": {
                 "tags": {
-                    "name": "Jamba Juice",
-                    "amenity": "fast_food"
+                    "name": "Mandarin",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Jamba Juice",
-                "icon": "fast-food",
+                "name": "Mandarin",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73172,17 +76638,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Jimmy John's": {
+            "amenity/restaurant/Hong Kong": {
                 "tags": {
                 "tags": {
-                    "name": "Jimmy John's",
-                    "amenity": "fast_food"
+                    "name": "Hong Kong",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Jimmy John's",
-                "icon": "fast-food",
+                "name": "Hong Kong",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73191,17 +76659,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Jollibee": {
+            "amenity/restaurant/Zizzi": {
                 "tags": {
                 "tags": {
-                    "name": "Jollibee",
-                    "amenity": "fast_food"
+                    "name": "Zizzi",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Jollibee",
-                "icon": "fast-food",
+                "name": "Zizzi",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73210,18 +76680,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/KFC": {
+            "amenity/restaurant/Cracker Barrel": {
                 "tags": {
                 "tags": {
-                    "name": "KFC",
-                    "cuisine": "chicken",
-                    "amenity": "fast_food"
+                    "name": "Cracker Barrel",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "KFC",
-                "icon": "fast-food",
+                "name": "Cracker Barrel",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73230,17 +76701,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Kebab": {
+            "amenity/restaurant/Rhodos": {
                 "tags": {
                 "tags": {
-                    "name": "Kebab",
-                    "amenity": "fast_food"
+                    "name": "Rhodos",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Kebab",
-                "icon": "fast-food",
+                "name": "Rhodos",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73249,17 +76722,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Kochlöffel": {
+            "amenity/restaurant/Lindenhof": {
                 "tags": {
                 "tags": {
-                    "name": "Kochlöffel",
-                    "amenity": "fast_food"
+                    "name": "Lindenhof",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Kochlöffel",
-                "icon": "fast-food",
+                "name": "Lindenhof",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73268,17 +76743,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Kotipizza": {
+            "amenity/restaurant/Milano": {
                 "tags": {
                 "tags": {
-                    "name": "Kotipizza",
-                    "amenity": "fast_food"
+                    "name": "Milano",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Kotipizza",
-                "icon": "fast-food",
+                "name": "Milano",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73287,17 +76764,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Little Caesars": {
+            "amenity/restaurant/Dolce Vita": {
                 "tags": {
                 "tags": {
-                    "name": "Little Caesars",
-                    "amenity": "fast_food"
+                    "name": "Dolce Vita",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Little Caesars",
-                "icon": "fast-food",
+                "name": "Dolce Vita",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73306,17 +76785,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Long John Silver's": {
+            "amenity/restaurant/Kirchenwirt": {
                 "tags": {
                 "tags": {
-                    "name": "Long John Silver's",
-                    "amenity": "fast_food"
+                    "name": "Kirchenwirt",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Long John Silver's",
-                "icon": "fast-food",
+                "name": "Kirchenwirt",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73325,18 +76806,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/McDonald's": {
+            "amenity/restaurant/Kantine": {
                 "tags": {
                 "tags": {
-                    "name": "McDonald's",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Kantine",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "McDonald's",
-                "icon": "fast-food",
+                "name": "Kantine",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73345,17 +76827,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Mr. Sub": {
+            "amenity/restaurant/Ochsen": {
                 "tags": {
                 "tags": {
-                    "name": "Mr. Sub",
-                    "amenity": "fast_food"
+                    "name": "Ochsen",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Mr. Sub",
-                "icon": "fast-food",
+                "name": "Ochsen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73364,17 +76848,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Nordsee": {
+            "amenity/restaurant/Spur": {
                 "tags": {
                 "tags": {
-                    "name": "Nordsee",
-                    "amenity": "fast_food"
+                    "name": "Spur",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Nordsee",
-                "icon": "fast-food",
+                "name": "Spur",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73383,17 +76869,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Panda Express": {
+            "amenity/restaurant/Mykonos": {
                 "tags": {
                 "tags": {
-                    "name": "Panda Express",
-                    "amenity": "fast_food"
+                    "name": "Mykonos",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Panda Express",
-                "icon": "fast-food",
+                "name": "Mykonos",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73402,18 +76890,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Papa John's": {
+            "amenity/restaurant/Lotus": {
                 "tags": {
                 "tags": {
-                    "name": "Papa John's",
-                    "cuisine": "pizza",
-                    "amenity": "fast_food"
+                    "name": "Lotus",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Papa John's",
-                "icon": "fast-food",
+                "name": "Lotus",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73422,17 +76911,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Pizza Nova": {
+            "amenity/restaurant/Applebee's": {
                 "tags": {
                 "tags": {
-                    "name": "Pizza Nova",
-                    "amenity": "fast_food"
+                    "name": "Applebee's",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Pizza Nova",
-                "icon": "fast-food",
+                "name": "Applebee's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73441,17 +76932,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Pizza Pizza": {
+            "amenity/restaurant/Flunch": {
                 "tags": {
                 "tags": {
-                    "name": "Pizza Pizza",
-                    "amenity": "fast_food"
+                    "name": "Flunch",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Pizza Pizza",
-                "icon": "fast-food",
+                "name": "Flunch",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73460,17 +76953,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Pollo Campero": {
+            "amenity/restaurant/Zur Post": {
                 "tags": {
                 "tags": {
-                    "name": "Pollo Campero",
-                    "amenity": "fast_food"
+                    "name": "Zur Post",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Pollo Campero",
-                "icon": "fast-food",
+                "name": "Zur Post",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73479,18 +76974,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Popeye's": {
+            "amenity/restaurant/China Town": {
                 "tags": {
                 "tags": {
-                    "name": "Popeye's",
-                    "cuisine": "chicken",
-                    "amenity": "fast_food"
+                    "name": "China Town",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Popeye's",
-                "icon": "fast-food",
+                "name": "China Town",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73499,17 +76995,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Quick": {
+            "amenity/restaurant/La Dolce Vita": {
                 "tags": {
                 "tags": {
-                    "name": "Quick",
-                    "amenity": "fast_food"
+                    "name": "La Dolce Vita",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Quick",
-                "icon": "fast-food",
+                "name": "La Dolce Vita",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73518,18 +77016,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Quiznos": {
+            "amenity/restaurant/Waffle House": {
                 "tags": {
                 "tags": {
-                    "name": "Quiznos",
-                    "cuisine": "sandwich",
-                    "amenity": "fast_food"
+                    "name": "Waffle House",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Quiznos",
-                "icon": "fast-food",
+                "name": "Waffle House",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73538,17 +77037,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Red Rooster": {
+            "amenity/restaurant/Delphi": {
                 "tags": {
                 "tags": {
-                    "name": "Red Rooster",
-                    "amenity": "fast_food"
+                    "name": "Delphi",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Red Rooster",
-                "icon": "fast-food",
+                "name": "Delphi",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73557,17 +77058,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Sibylla": {
+            "amenity/restaurant/Linde": {
                 "tags": {
                 "tags": {
-                    "name": "Sibylla",
-                    "amenity": "fast_food"
+                    "name": "Linde",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Sibylla",
-                "icon": "fast-food",
+                "name": "Linde",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73576,18 +77079,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Sonic": {
+            "amenity/restaurant/Dionysos": {
                 "tags": {
                 "tags": {
-                    "name": "Sonic",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Dionysos",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Sonic",
-                "icon": "fast-food",
+                "name": "Dionysos",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73596,17 +77100,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Steers": {
+            "amenity/restaurant/Outback Steakhouse": {
                 "tags": {
                 "tags": {
-                    "name": "Steers",
-                    "amenity": "fast_food"
+                    "name": "Outback Steakhouse",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Steers",
-                "icon": "fast-food",
+                "name": "Outback Steakhouse",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73615,17 +77121,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Taco Bell": {
+            "amenity/restaurant/Kelsey's": {
                 "tags": {
                 "tags": {
-                    "name": "Taco Bell",
-                    "amenity": "fast_food"
+                    "name": "Kelsey's",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Taco Bell",
-                "icon": "fast-food",
+                "name": "Kelsey's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73634,17 +77142,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Taco John's": {
+            "amenity/restaurant/Boston Pizza": {
                 "tags": {
                 "tags": {
-                    "name": "Taco John's",
-                    "amenity": "fast_food"
+                    "name": "Boston Pizza",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Taco John's",
-                "icon": "fast-food",
+                "name": "Boston Pizza",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73653,17 +77163,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Taco Time": {
+            "amenity/restaurant/Bella Italia": {
                 "tags": {
                 "tags": {
-                    "name": "Taco Time",
-                    "amenity": "fast_food"
+                    "name": "Bella Italia",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Taco Time",
-                "icon": "fast-food",
+                "name": "Bella Italia",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73672,17 +77184,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Telepizza": {
+            "amenity/restaurant/Sizzler": {
                 "tags": {
                 "tags": {
-                    "name": "Telepizza",
-                    "amenity": "fast_food"
+                    "name": "Sizzler",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Telepizza",
-                "icon": "fast-food",
+                "name": "Sizzler",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73691,17 +77205,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Tim Hortons": {
+            "amenity/restaurant/Grüner Baum": {
                 "tags": {
                 "tags": {
-                    "name": "Tim Hortons",
-                    "amenity": "fast_food"
+                    "name": "Grüner Baum",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Tim Hortons",
-                "icon": "fast-food",
+                "name": "Grüner Baum",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73710,18 +77226,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Wendy's": {
+            "amenity/restaurant/Taj Mahal": {
                 "tags": {
                 "tags": {
-                    "name": "Wendy's",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Taj Mahal",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Wendy's",
-                "icon": "fast-food",
+                "name": "Taj Mahal",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73730,17 +77247,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Whataburger": {
+            "amenity/restaurant/Rössli": {
                 "tags": {
                 "tags": {
-                    "name": "Whataburger",
-                    "amenity": "fast_food"
+                    "name": "Rössli",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Whataburger",
-                "icon": "fast-food",
+                "name": "Rössli",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73749,17 +77268,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/White Castle": {
+            "amenity/restaurant/Traube": {
                 "tags": {
                 "tags": {
-                    "name": "White Castle",
-                    "amenity": "fast_food"
+                    "name": "Traube",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "White Castle",
-                "icon": "fast-food",
+                "name": "Traube",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73768,17 +77289,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Wimpy": {
+            "amenity/restaurant/Red Robin": {
                 "tags": {
                 "tags": {
-                    "name": "Wimpy",
-                    "amenity": "fast_food"
+                    "name": "Red Robin",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Wimpy",
-                "icon": "fast-food",
+                "name": "Red Robin",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73787,18 +77310,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Макдоналдс": {
+            "amenity/restaurant/Roma": {
                 "tags": {
                 "tags": {
-                    "name": "Макдоналдс",
-                    "name:en": "McDonald's",
-                    "amenity": "fast_food"
+                    "name": "Roma",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Макдоналдс",
-                "icon": "fast-food",
+                "name": "Roma",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73807,17 +77331,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Робин Сдобин": {
+            "amenity/restaurant/San Marco": {
                 "tags": {
                 "tags": {
-                    "name": "Робин Сдобин",
-                    "amenity": "fast_food"
+                    "name": "San Marco",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Робин Сдобин",
-                "icon": "fast-food",
+                "name": "San Marco",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73826,17 +77352,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Русский Аппетит": {
+            "amenity/restaurant/Hellas": {
                 "tags": {
                 "tags": {
-                    "name": "Русский Аппетит",
-                    "amenity": "fast_food"
+                    "name": "Hellas",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Русский Аппетит",
-                "icon": "fast-food",
+                "name": "Hellas",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73845,17 +77373,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/Теремок": {
+            "amenity/restaurant/La Perla": {
                 "tags": {
                 "tags": {
-                    "name": "Теремок",
-                    "amenity": "fast_food"
+                    "name": "La Perla",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Теремок",
-                "icon": "fast-food",
+                "name": "La Perla",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73864,18 +77394,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/すき家": {
+            "amenity/restaurant/Vips": {
                 "tags": {
                 "tags": {
-                    "name": "すき家",
-                    "name:en": "SUKIYA",
-                    "amenity": "fast_food"
+                    "name": "Vips",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "すき家",
-                "icon": "fast-food",
+                "name": "Vips",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73884,17 +77415,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/なか卯": {
+            "amenity/restaurant/Panera Bread": {
                 "tags": {
                 "tags": {
-                    "name": "なか卯",
-                    "amenity": "fast_food"
+                    "name": "Panera Bread",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "なか卯",
-                "icon": "fast-food",
+                "name": "Panera Bread",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73903,19 +77436,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/ケンタッキーフライドチキン": {
+            "amenity/restaurant/Da Vinci": {
                 "tags": {
                 "tags": {
-                    "name": "ケンタッキーフライドチキン",
-                    "name:en": "KFC",
-                    "cuisine": "chicken",
-                    "amenity": "fast_food"
+                    "name": "Da Vinci",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "ケンタッキーフライドチキン",
-                "icon": "fast-food",
+                "name": "Da Vinci",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73924,19 +77457,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/マクドナルド": {
+            "amenity/restaurant/Hippopotamus": {
                 "tags": {
                 "tags": {
-                    "name": "マクドナルド",
-                    "name:en": "McDonald's",
-                    "cuisine": "burger",
-                    "amenity": "fast_food"
+                    "name": "Hippopotamus",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "マクドナルド",
-                "icon": "fast-food",
+                "name": "Hippopotamus",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73945,18 +77478,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/モスバーガー": {
+            "amenity/restaurant/Prezzo": {
                 "tags": {
                 "tags": {
-                    "name": "モスバーガー",
-                    "name:en": "MOS BURGER",
-                    "amenity": "fast_food"
+                    "name": "Prezzo",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "モスバーガー",
-                "icon": "fast-food",
+                "name": "Prezzo",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73965,17 +77499,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/吉野家": {
+            "amenity/restaurant/Courtepaille": {
                 "tags": {
                 "tags": {
-                    "name": "吉野家",
-                    "amenity": "fast_food"
+                    "name": "Courtepaille",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "吉野家",
-                "icon": "fast-food",
+                "name": "Courtepaille",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -73984,18 +77520,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/松屋": {
+            "amenity/restaurant/Hard Rock Cafe": {
                 "tags": {
                 "tags": {
-                    "name": "松屋",
-                    "name:en": "Matsuya",
-                    "amenity": "fast_food"
+                    "name": "Hard Rock Cafe",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "松屋",
-                "icon": "fast-food",
+                "name": "Hard Rock Cafe",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -74004,17 +77541,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/肯德基": {
+            "amenity/restaurant/Panorama": {
                 "tags": {
                 "tags": {
-                    "name": "肯德基",
-                    "amenity": "fast_food"
+                    "name": "Panorama",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "肯德基",
-                "icon": "fast-food",
+                "name": "Panorama",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -74023,17 +77562,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fast_food/麥當勞": {
+            "amenity/restaurant/デニーズ": {
                 "tags": {
                 "tags": {
-                    "name": "麥當勞",
-                    "amenity": "fast_food"
+                    "name": "デニーズ",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "麥當勞",
-                "icon": "fast-food",
+                "name": "デニーズ",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -74042,6884 +77583,7235 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/76": {
+            "amenity/restaurant/Sportheim": {
                 "tags": {
                 "tags": {
-                    "name": "76",
-                    "amenity": "fuel"
+                    "name": "Sportheim",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "76",
-                "icon": "fuel",
+                "name": "Sportheim",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/1-2-3": {
+            "amenity/restaurant/餃子の王将": {
                 "tags": {
                 "tags": {
-                    "name": "1-2-3",
-                    "amenity": "fuel"
+                    "name": "餃子の王将",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "1-2-3",
-                "icon": "fuel",
+                "name": "餃子の王将",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/7-Eleven": {
+            "amenity/restaurant/Bären": {
                 "tags": {
                 "tags": {
-                    "name": "7-Eleven",
-                    "amenity": "fuel"
+                    "name": "Bären",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "7-Eleven",
-                "icon": "fuel",
+                "name": "Bären",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ABC": {
+            "amenity/restaurant/Alte Post": {
                 "tags": {
                 "tags": {
-                    "name": "ABC",
-                    "amenity": "fuel"
+                    "name": "Alte Post",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "ABC",
-                "icon": "fuel",
+                "name": "Alte Post",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Agip": {
+            "amenity/restaurant/China Garden": {
                 "tags": {
                 "tags": {
-                    "name": "Agip",
-                    "amenity": "fuel"
+                    "name": "China Garden",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Agip",
-                "icon": "fuel",
+                "name": "China Garden",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ANP": {
+            "amenity/restaurant/Vapiano": {
                 "tags": {
                 "tags": {
-                    "name": "ANP",
-                    "amenity": "fuel"
+                    "name": "Vapiano",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "ANP",
-                "icon": "fuel",
+                "name": "Vapiano",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ARAL": {
+            "amenity/restaurant/Mamma Mia": {
                 "tags": {
                 "tags": {
-                    "name": "ARAL",
-                    "amenity": "fuel"
+                    "name": "Mamma Mia",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "ARAL",
-                "icon": "fuel",
+                "name": "Mamma Mia",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Avia": {
+            "amenity/restaurant/Schwarzer Adler": {
                 "tags": {
                 "tags": {
-                    "name": "Avia",
-                    "amenity": "fuel"
+                    "name": "Schwarzer Adler",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Avia",
-                "icon": "fuel",
+                "name": "Schwarzer Adler",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Afriquia": {
+            "amenity/restaurant/IHOP": {
                 "tags": {
                 "tags": {
-                    "name": "Afriquia",
-                    "amenity": "fuel"
+                    "name": "IHOP",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Afriquia",
-                "icon": "fuel",
+                "name": "IHOP",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Agrola": {
+            "amenity/restaurant/Chili's": {
                 "tags": {
                 "tags": {
-                    "name": "Agrola",
-                    "amenity": "fuel"
+                    "name": "Chili's",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Agrola",
-                "icon": "fuel",
+                "name": "Chili's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Api": {
+            "amenity/restaurant/Olive Garden": {
                 "tags": {
                 "tags": {
-                    "name": "Api",
-                    "amenity": "fuel"
+                    "name": "Olive Garden",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Api",
-                "icon": "fuel",
+                "name": "Olive Garden",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Aral": {
+            "amenity/restaurant/Friendly's": {
                 "tags": {
                 "tags": {
-                    "name": "Aral",
-                    "amenity": "fuel"
+                    "name": "Friendly's",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Aral",
-                "icon": "fuel",
+                "name": "Friendly's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Arco": {
+            "amenity/restaurant/Buffalo Grill": {
                 "tags": {
                 "tags": {
-                    "name": "Arco",
-                    "amenity": "fuel"
+                    "name": "Buffalo Grill",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Arco",
-                "icon": "fuel",
+                "name": "Buffalo Grill",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Auchan": {
+            "amenity/restaurant/Texas Roadhouse": {
                 "tags": {
                 "tags": {
-                    "name": "Auchan",
-                    "amenity": "fuel"
+                    "name": "Texas Roadhouse",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Auchan",
-                "icon": "fuel",
+                "name": "Texas Roadhouse",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Avanti": {
+            "amenity/restaurant/ガスト": {
                 "tags": {
                 "tags": {
-                    "name": "Avanti",
-                    "amenity": "fuel"
+                    "name": "ガスト",
+                    "name:en": "Gusto",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Avanti",
-                "icon": "fuel",
+                "name": "ガスト",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/BFT": {
+            "amenity/restaurant/Sakura": {
                 "tags": {
                 "tags": {
-                    "name": "BFT",
-                    "amenity": "fuel"
+                    "name": "Sakura",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "BFT",
-                "icon": "fuel",
+                "name": "Sakura",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/BP": {
+            "amenity/restaurant/Mensa": {
                 "tags": {
                 "tags": {
-                    "name": "BP",
-                    "amenity": "fuel"
+                    "name": "Mensa",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "BP",
-                "icon": "fuel",
+                "name": "Mensa",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/BR": {
+            "amenity/restaurant/The Keg": {
                 "tags": {
                 "tags": {
-                    "name": "BR",
-                    "amenity": "fuel"
+                    "name": "The Keg",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "BR",
-                "icon": "fuel",
+                "name": "The Keg",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Benzina": {
+            "amenity/restaurant/サイゼリヤ": {
                 "tags": {
                 "tags": {
-                    "name": "Benzina",
-                    "amenity": "fuel"
+                    "name": "サイゼリヤ",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Benzina",
-                "icon": "fuel",
+                "name": "サイゼリヤ",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Bliska": {
+            "amenity/restaurant/La Strada": {
                 "tags": {
                 "tags": {
-                    "name": "Bliska",
-                    "amenity": "fuel"
+                    "name": "La Strada",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Bliska",
-                "icon": "fuel",
+                "name": "La Strada",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/C. C. E. Leclerc": {
+            "amenity/restaurant/Village Inn": {
                 "tags": {
                 "tags": {
-                    "name": "C. C. E. Leclerc",
-                    "amenity": "fuel"
+                    "name": "Village Inn",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "C. C. E. Leclerc",
-                "icon": "fuel",
+                "name": "Village Inn",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/CAMPSA": {
+            "amenity/restaurant/Buffalo Wild Wings": {
                 "tags": {
                 "tags": {
-                    "name": "CAMPSA",
-                    "amenity": "fuel"
+                    "name": "Buffalo Wild Wings",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "CAMPSA",
-                "icon": "fuel",
+                "name": "Buffalo Wild Wings",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/CARREFOUR": {
+            "amenity/restaurant/Peking": {
                 "tags": {
                 "tags": {
-                    "name": "CARREFOUR",
-                    "amenity": "fuel"
+                    "name": "Peking",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "CARREFOUR",
-                "icon": "fuel",
+                "name": "Peking",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/CEPSA": {
+            "amenity/restaurant/California Pizza Kitchen": {
                 "tags": {
                 "tags": {
-                    "name": "CEPSA",
-                    "amenity": "fuel"
+                    "name": "California Pizza Kitchen",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "CEPSA",
-                "icon": "fuel",
+                "name": "California Pizza Kitchen",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/COSMO": {
+            "amenity/restaurant/Якитория": {
                 "tags": {
                 "tags": {
-                    "name": "COSMO",
-                    "amenity": "fuel"
+                    "name": "Якитория",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "COSMO",
-                "icon": "fuel",
+                "name": "Якитория",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Caltex": {
+            "amenity/restaurant/Golden Corral": {
                 "tags": {
                 "tags": {
-                    "name": "Caltex",
-                    "amenity": "fuel"
+                    "name": "Golden Corral",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Caltex",
-                "icon": "fuel",
+                "name": "Golden Corral",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Canadian Tire": {
+            "amenity/restaurant/Perkins": {
                 "tags": {
                 "tags": {
-                    "name": "Canadian Tire",
-                    "amenity": "fuel"
+                    "name": "Perkins",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Canadian Tire",
-                "icon": "fuel",
+                "name": "Perkins",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Carrefour": {
+            "amenity/restaurant/Ruby Tuesday": {
                 "tags": {
                 "tags": {
-                    "name": "Carrefour",
-                    "amenity": "fuel"
+                    "name": "Ruby Tuesday",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Carrefour",
-                "icon": "fuel",
+                "name": "Ruby Tuesday",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Casey's General Store": {
+            "amenity/restaurant/Shari's": {
                 "tags": {
                 "tags": {
-                    "name": "Casey's General Store",
-                    "amenity": "fuel"
+                    "name": "Shari's",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Casey's General Store",
-                "icon": "fuel",
+                "name": "Shari's",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Cenex": {
+            "amenity/restaurant/Bob Evans": {
                 "tags": {
                 "tags": {
-                    "name": "Cenex",
-                    "amenity": "fuel"
+                    "name": "Bob Evans",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Cenex",
-                "icon": "fuel",
+                "name": "Bob Evans",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Cepsa": {
+            "amenity/restaurant/바다횟집 (Bada Fish Restaurant)": {
                 "tags": {
                 "tags": {
-                    "name": "Cepsa",
-                    "amenity": "fuel"
+                    "name": "바다횟집 (Bada Fish Restaurant)",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Cepsa",
-                "icon": "fuel",
+                "name": "바다횟집 (Bada Fish Restaurant)",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Chevron": {
+            "amenity/restaurant/Mang Inasal": {
                 "tags": {
                 "tags": {
-                    "name": "Chevron",
-                    "amenity": "fuel"
+                    "name": "Mang Inasal",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Chevron",
-                "icon": "fuel",
+                "name": "Mang Inasal",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Circle K": {
+            "amenity/restaurant/Евразия": {
                 "tags": {
                 "tags": {
-                    "name": "Circle K",
-                    "amenity": "fuel"
+                    "name": "Евразия",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Circle K",
-                "icon": "fuel",
+                "name": "Евразия",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Citgo": {
+            "amenity/restaurant/ジョナサン": {
                 "tags": {
                 "tags": {
-                    "name": "Citgo",
-                    "amenity": "fuel"
+                    "name": "ジョナサン",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Citgo",
-                "icon": "fuel",
+                "name": "ジョナサン",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Coles Express": {
+            "amenity/restaurant/Longhorn Steakhouse": {
                 "tags": {
                 "tags": {
-                    "name": "Coles Express",
-                    "amenity": "fuel"
+                    "name": "Longhorn Steakhouse",
+                    "amenity": "restaurant"
                 },
                 },
-                "name": "Coles Express",
-                "icon": "fuel",
+                "name": "Longhorn Steakhouse",
+                "icon": "restaurant",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "cuisine",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours",
+                    "capacity"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Conoco": {
+            "amenity/bank/Chase": {
                 "tags": {
                 "tags": {
-                    "name": "Conoco",
-                    "amenity": "fuel"
+                    "name": "Chase",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Conoco",
-                "icon": "fuel",
+                "name": "Chase",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Coop": {
+            "amenity/bank/Commonwealth Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Coop",
-                    "amenity": "fuel"
+                    "name": "Commonwealth Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Coop",
-                "icon": "fuel",
+                "name": "Commonwealth Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Copec": {
+            "amenity/bank/Citibank": {
                 "tags": {
                 "tags": {
-                    "name": "Copec",
-                    "amenity": "fuel"
+                    "name": "Citibank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Copec",
-                "icon": "fuel",
+                "name": "Citibank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/E.Leclerc": {
+            "amenity/bank/HSBC": {
                 "tags": {
                 "tags": {
-                    "name": "E.Leclerc",
-                    "amenity": "fuel"
+                    "name": "HSBC",
+                    "amenity": "bank"
                 },
                 },
-                "name": "E.Leclerc",
-                "icon": "fuel",
+                "name": "HSBC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/EKO": {
+            "amenity/bank/Barclays": {
                 "tags": {
                 "tags": {
-                    "name": "EKO",
-                    "amenity": "fuel"
+                    "name": "Barclays",
+                    "amenity": "bank"
                 },
                 },
-                "name": "EKO",
-                "icon": "fuel",
+                "name": "Barclays",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ENEOS": {
+            "amenity/bank/Westpac": {
                 "tags": {
                 "tags": {
-                    "name": "ENEOS",
-                    "amenity": "fuel"
+                    "name": "Westpac",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ENEOS",
-                "icon": "fuel",
+                "name": "Westpac",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ERG": {
+            "amenity/bank/NAB": {
                 "tags": {
                 "tags": {
-                    "name": "ERG",
-                    "amenity": "fuel"
+                    "name": "NAB",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ERG",
-                "icon": "fuel",
+                "name": "NAB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Esso": {
+            "amenity/bank/ANZ": {
                 "tags": {
                 "tags": {
-                    "name": "Esso",
-                    "amenity": "fuel"
+                    "name": "ANZ",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Esso",
-                "icon": "fuel",
+                "name": "ANZ",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Eko": {
+            "amenity/bank/Lloyds Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Eko",
-                    "amenity": "fuel"
+                    "name": "Lloyds Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Eko",
-                "icon": "fuel",
+                "name": "Lloyds Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Elan": {
+            "amenity/bank/Landbank": {
                 "tags": {
                 "tags": {
-                    "name": "Elan",
-                    "amenity": "fuel"
+                    "name": "Landbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Elan",
-                "icon": "fuel",
+                "name": "Landbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Elf": {
+            "amenity/bank/Sparkasse": {
                 "tags": {
                 "tags": {
-                    "name": "Elf",
-                    "amenity": "fuel"
+                    "name": "Sparkasse",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Elf",
-                "icon": "fuel",
+                "name": "Sparkasse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Eneos": {
+            "amenity/bank/UCPB": {
                 "tags": {
                 "tags": {
-                    "name": "Eneos",
-                    "amenity": "fuel"
+                    "name": "UCPB",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Eneos",
-                "icon": "fuel",
+                "name": "UCPB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Engen": {
+            "amenity/bank/PNB": {
                 "tags": {
                 "tags": {
-                    "name": "Engen",
-                    "amenity": "fuel"
+                    "name": "PNB",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Engen",
-                "icon": "fuel",
+                "name": "PNB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Eni": {
+            "amenity/bank/Metrobank": {
                 "tags": {
                 "tags": {
-                    "name": "Eni",
-                    "amenity": "fuel"
+                    "name": "Metrobank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Eni",
-                "icon": "fuel",
+                "name": "Metrobank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Erg": {
+            "amenity/bank/BDO": {
                 "tags": {
                 "tags": {
-                    "name": "Erg",
-                    "amenity": "fuel"
+                    "name": "BDO",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Erg",
-                "icon": "fuel",
+                "name": "BDO",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Esso Express": {
+            "amenity/bank/Volksbank": {
                 "tags": {
                 "tags": {
-                    "name": "Esso Express",
-                    "amenity": "fuel"
+                    "name": "Volksbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Esso Express",
-                "icon": "fuel",
+                "name": "Volksbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Exxon": {
+            "amenity/bank/BPI": {
                 "tags": {
                 "tags": {
-                    "name": "Exxon",
-                    "amenity": "fuel"
+                    "name": "BPI",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Exxon",
-                "icon": "fuel",
+                "name": "BPI",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Flying V": {
+            "amenity/bank/Postbank": {
                 "tags": {
                 "tags": {
-                    "name": "Flying V",
-                    "amenity": "fuel"
+                    "name": "Postbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Flying V",
-                "icon": "fuel",
+                "name": "Postbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Freie Tankstelle": {
+            "amenity/bank/NatWest": {
                 "tags": {
                 "tags": {
-                    "name": "Freie Tankstelle",
-                    "amenity": "fuel"
+                    "name": "NatWest",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Freie Tankstelle",
-                "icon": "fuel",
+                "name": "NatWest",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/GALP": {
+            "amenity/bank/Yorkshire Bank": {
                 "tags": {
                 "tags": {
-                    "name": "GALP",
-                    "amenity": "fuel"
+                    "name": "Yorkshire Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "GALP",
-                "icon": "fuel",
+                "name": "Yorkshire Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Gulf": {
+            "amenity/bank/ABSA": {
                 "tags": {
                 "tags": {
-                    "name": "Gulf",
-                    "amenity": "fuel"
+                    "name": "ABSA",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Gulf",
-                "icon": "fuel",
+                "name": "ABSA",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/HEM": {
+            "amenity/bank/Standard Bank": {
                 "tags": {
                 "tags": {
-                    "name": "HEM",
-                    "amenity": "fuel"
+                    "name": "Standard Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "HEM",
-                "icon": "fuel",
+                "name": "Standard Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/HP": {
+            "amenity/bank/FNB": {
                 "tags": {
                 "tags": {
-                    "name": "HP",
-                    "amenity": "fuel"
+                    "name": "FNB",
+                    "amenity": "bank"
                 },
                 },
-                "name": "HP",
-                "icon": "fuel",
+                "name": "FNB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Hess": {
+            "amenity/bank/Deutsche Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Hess",
-                    "amenity": "fuel"
+                    "name": "Deutsche Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Hess",
-                "icon": "fuel",
+                "name": "Deutsche Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Holiday": {
+            "amenity/bank/SEB": {
                 "tags": {
                 "tags": {
-                    "name": "Holiday",
-                    "amenity": "fuel"
+                    "name": "SEB",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Holiday",
-                "icon": "fuel",
+                "name": "SEB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Husky": {
+            "amenity/bank/Commerzbank": {
                 "tags": {
                 "tags": {
-                    "name": "Husky",
-                    "amenity": "fuel"
+                    "name": "Commerzbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Husky",
-                "icon": "fuel",
+                "name": "Commerzbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/IDEMITSU": {
+            "amenity/bank/Targobank": {
                 "tags": {
                 "tags": {
-                    "name": "IDEMITSU",
-                    "amenity": "fuel"
+                    "name": "Targobank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "IDEMITSU",
-                "icon": "fuel",
+                "name": "Targobank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/IES": {
+            "amenity/bank/ABN AMRO": {
                 "tags": {
                 "tags": {
-                    "name": "IES",
-                    "amenity": "fuel"
+                    "name": "ABN AMRO",
+                    "amenity": "bank"
                 },
                 },
-                "name": "IES",
-                "icon": "fuel",
+                "name": "ABN AMRO",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/INA": {
+            "amenity/bank/Handelsbanken": {
                 "tags": {
                 "tags": {
-                    "name": "INA",
-                    "amenity": "fuel"
-                },
-                "name": "INA",
-                "icon": "fuel",
+                    "name": "Handelsbanken",
+                    "amenity": "bank"
+                },
+                "name": "Handelsbanken",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/IP": {
+            "amenity/bank/Swedbank": {
                 "tags": {
                 "tags": {
-                    "name": "IP",
-                    "amenity": "fuel"
+                    "name": "Swedbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "IP",
-                "icon": "fuel",
+                "name": "Swedbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Indian Oil": {
+            "amenity/bank/Kreissparkasse": {
                 "tags": {
                 "tags": {
-                    "name": "Indian Oil",
-                    "amenity": "fuel"
+                    "name": "Kreissparkasse",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Indian Oil",
-                "icon": "fuel",
+                "name": "Kreissparkasse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Indipend.": {
+            "amenity/bank/UniCredit Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Indipend.",
-                    "amenity": "fuel"
+                    "name": "UniCredit Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Indipend.",
-                "icon": "fuel",
+                "name": "UniCredit Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Intermarché": {
+            "amenity/bank/Monte dei Paschi di Siena": {
                 "tags": {
                 "tags": {
-                    "name": "Intermarché",
-                    "amenity": "fuel"
+                    "name": "Monte dei Paschi di Siena",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Intermarché",
-                "icon": "fuel",
+                "name": "Monte dei Paschi di Siena",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Ipiranga": {
+            "amenity/bank/Caja Rural": {
                 "tags": {
                 "tags": {
-                    "name": "Ipiranga",
-                    "amenity": "fuel"
+                    "name": "Caja Rural",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Ipiranga",
-                "icon": "fuel",
+                "name": "Caja Rural",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Irving": {
+            "amenity/bank/Dresdner Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Irving",
-                    "amenity": "fuel"
+                    "name": "Dresdner Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Irving",
-                "icon": "fuel",
+                "name": "Dresdner Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/JET": {
+            "amenity/bank/Sparda-Bank": {
                 "tags": {
                 "tags": {
-                    "name": "JET",
-                    "amenity": "fuel"
+                    "name": "Sparda-Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "JET",
-                "icon": "fuel",
+                "name": "Sparda-Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/JOMO": {
+            "amenity/bank/VÚB": {
                 "tags": {
                 "tags": {
-                    "name": "JOMO",
-                    "amenity": "fuel"
+                    "name": "VÚB",
+                    "amenity": "bank"
                 },
                 },
-                "name": "JOMO",
-                "icon": "fuel",
+                "name": "VÚB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Jet": {
+            "amenity/bank/Slovenská sporiteľňa": {
                 "tags": {
                 "tags": {
-                    "name": "Jet",
-                    "amenity": "fuel"
+                    "name": "Slovenská sporiteľňa",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Jet",
-                "icon": "fuel",
+                "name": "Slovenská sporiteľňa",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Kum & Go": {
+            "amenity/bank/Bank of Montreal": {
                 "tags": {
                 "tags": {
-                    "name": "Kum & Go",
-                    "amenity": "fuel"
+                    "name": "Bank of Montreal",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Kum & Go",
-                "icon": "fuel",
+                "name": "Bank of Montreal",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Kwik Trip": {
+            "amenity/bank/KBC": {
                 "tags": {
                 "tags": {
-                    "name": "Kwik Trip",
-                    "amenity": "fuel"
+                    "name": "KBC",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Kwik Trip",
-                "icon": "fuel",
+                "name": "KBC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/LPG": {
+            "amenity/bank/Royal Bank of Scotland": {
                 "tags": {
                 "tags": {
-                    "name": "LPG",
-                    "amenity": "fuel"
+                    "name": "Royal Bank of Scotland",
+                    "amenity": "bank"
                 },
                 },
-                "name": "LPG",
-                "icon": "fuel",
+                "name": "Royal Bank of Scotland",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Lotos": {
+            "amenity/bank/TSB": {
                 "tags": {
                 "tags": {
-                    "name": "Lotos",
-                    "amenity": "fuel"
+                    "name": "TSB",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Lotos",
-                "icon": "fuel",
+                "name": "TSB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Lukoil": {
+            "amenity/bank/US Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Lukoil",
-                    "amenity": "fuel"
+                    "name": "US Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Lukoil",
-                "icon": "fuel",
+                "name": "US Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/MEROIL": {
+            "amenity/bank/HypoVereinsbank": {
                 "tags": {
                 "tags": {
-                    "name": "MEROIL",
-                    "amenity": "fuel"
+                    "name": "HypoVereinsbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "MEROIL",
-                "icon": "fuel",
+                "name": "HypoVereinsbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/MOL": {
+            "amenity/bank/Bank Austria": {
                 "tags": {
                 "tags": {
-                    "name": "MOL",
-                    "amenity": "fuel"
+                    "name": "Bank Austria",
+                    "amenity": "bank"
                 },
                 },
-                "name": "MOL",
-                "icon": "fuel",
+                "name": "Bank Austria",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Marathon": {
+            "amenity/bank/ING": {
                 "tags": {
                 "tags": {
-                    "name": "Marathon",
-                    "amenity": "fuel"
+                    "name": "ING",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Marathon",
-                "icon": "fuel",
+                "name": "ING",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Metano": {
+            "amenity/bank/Erste Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Metano",
-                    "amenity": "fuel"
+                    "name": "Erste Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Metano",
-                "icon": "fuel",
+                "name": "Erste Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Migrol": {
+            "amenity/bank/CIBC": {
                 "tags": {
                 "tags": {
-                    "name": "Migrol",
-                    "amenity": "fuel"
+                    "name": "CIBC",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Migrol",
-                "icon": "fuel",
+                "name": "CIBC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Mobil": {
+            "amenity/bank/Scotiabank": {
                 "tags": {
                 "tags": {
-                    "name": "Mobil",
-                    "amenity": "fuel"
+                    "name": "Scotiabank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Mobil",
-                "icon": "fuel",
+                "name": "Scotiabank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Mol": {
+            "amenity/bank/Caisse d'Épargne": {
                 "tags": {
                 "tags": {
-                    "name": "Mol",
-                    "amenity": "fuel"
+                    "name": "Caisse d'Épargne",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Mol",
-                "icon": "fuel",
+                "name": "Caisse d'Épargne",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Morrisons": {
+            "amenity/bank/Santander": {
                 "tags": {
                 "tags": {
-                    "name": "Morrisons",
-                    "amenity": "fuel"
+                    "name": "Santander",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Morrisons",
-                "icon": "fuel",
+                "name": "Santander",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Neste": {
+            "amenity/bank/Bank of Scotland": {
                 "tags": {
                 "tags": {
-                    "name": "Neste",
-                    "amenity": "fuel"
+                    "name": "Bank of Scotland",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Neste",
-                "icon": "fuel",
+                "name": "Bank of Scotland",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Neste A24": {
+            "amenity/bank/TD Canada Trust": {
                 "tags": {
                 "tags": {
-                    "name": "Neste A24",
-                    "amenity": "fuel"
+                    "name": "TD Canada Trust",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Neste A24",
-                "icon": "fuel",
+                "name": "TD Canada Trust",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/OIL!": {
+            "amenity/bank/BMO": {
                 "tags": {
                 "tags": {
-                    "name": "OIL!",
-                    "amenity": "fuel"
+                    "name": "BMO",
+                    "amenity": "bank"
                 },
                 },
-                "name": "OIL!",
-                "icon": "fuel",
+                "name": "BMO",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/OK": {
+            "amenity/bank/Danske Bank": {
                 "tags": {
                 "tags": {
-                    "name": "OK",
-                    "amenity": "fuel"
+                    "name": "Danske Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "OK",
-                "icon": "fuel",
+                "name": "Danske Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/OKKO": {
+            "amenity/bank/OTP": {
                 "tags": {
                 "tags": {
-                    "name": "OKKO",
-                    "amenity": "fuel"
+                    "name": "OTP",
+                    "amenity": "bank"
                 },
                 },
-                "name": "OKKO",
-                "icon": "fuel",
+                "name": "OTP",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/OKQ8": {
+            "amenity/bank/Crédit Agricole": {
                 "tags": {
                 "tags": {
-                    "name": "OKQ8",
-                    "amenity": "fuel"
+                    "name": "Crédit Agricole",
+                    "amenity": "bank"
                 },
                 },
-                "name": "OKQ8",
-                "icon": "fuel",
+                "name": "Crédit Agricole",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/OMV": {
+            "amenity/bank/LCL": {
                 "tags": {
                 "tags": {
-                    "name": "OMV",
-                    "amenity": "fuel"
+                    "name": "LCL",
+                    "amenity": "bank"
                 },
                 },
-                "name": "OMV",
-                "icon": "fuel",
+                "name": "LCL",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Oilibya": {
+            "amenity/bank/VR-Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Oilibya",
-                    "amenity": "fuel"
+                    "name": "VR-Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Oilibya",
-                "icon": "fuel",
+                "name": "VR-Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Orlen": {
+            "amenity/bank/ČSOB": {
                 "tags": {
                 "tags": {
-                    "name": "Orlen",
-                    "amenity": "fuel"
+                    "name": "ČSOB",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Orlen",
-                "icon": "fuel",
+                "name": "ČSOB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Pemex": {
+            "amenity/bank/Česká spořitelna": {
                 "tags": {
                 "tags": {
-                    "name": "Pemex",
-                    "amenity": "fuel"
+                    "name": "Česká spořitelna",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Pemex",
-                "icon": "fuel",
+                "name": "Česká spořitelna",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/PETRONOR": {
+            "amenity/bank/BNP": {
                 "tags": {
                 "tags": {
-                    "name": "PETRONOR",
-                    "amenity": "fuel"
+                    "name": "BNP",
+                    "amenity": "bank"
                 },
                 },
-                "name": "PETRONOR",
-                "icon": "fuel",
+                "name": "BNP",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/PTT": {
+            "amenity/bank/Royal Bank": {
                 "tags": {
                 "tags": {
-                    "name": "PTT",
-                    "amenity": "fuel"
-                },
-                "name": "PTT",
-                "icon": "fuel",
+                    "name": "Royal Bank",
+                    "amenity": "bank"
+                },
+                "name": "Royal Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Pertamina": {
+            "amenity/bank/Nationwide": {
                 "tags": {
                 "tags": {
-                    "name": "Pertamina",
-                    "amenity": "fuel"
+                    "name": "Nationwide",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Pertamina",
-                "icon": "fuel",
+                "name": "Nationwide",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Petro-Canada": {
+            "amenity/bank/Halifax": {
                 "tags": {
                 "tags": {
-                    "name": "Petro-Canada",
-                    "amenity": "fuel"
+                    "name": "Halifax",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Petro-Canada",
-                "icon": "fuel",
+                "name": "Halifax",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Petrobras": {
+            "amenity/bank/BAWAG PSK": {
                 "tags": {
                 "tags": {
-                    "name": "Petrobras",
-                    "amenity": "fuel"
+                    "name": "BAWAG PSK",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Petrobras",
-                "icon": "fuel",
+                "name": "BAWAG PSK",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Petrom": {
+            "amenity/bank/National Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Petrom",
-                    "amenity": "fuel"
+                    "name": "National Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Petrom",
-                "icon": "fuel",
+                "name": "National Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Petron": {
+            "amenity/bank/Nedbank": {
                 "tags": {
                 "tags": {
-                    "name": "Petron",
-                    "amenity": "fuel"
+                    "name": "Nedbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Petron",
-                "icon": "fuel",
+                "name": "Nedbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Petronas": {
+            "amenity/bank/First National Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Petronas",
-                    "amenity": "fuel"
+                    "name": "First National Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Petronas",
-                "icon": "fuel",
+                "name": "First National Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Phillips 66": {
+            "amenity/bank/Nordea": {
                 "tags": {
                 "tags": {
-                    "name": "Phillips 66",
-                    "amenity": "fuel"
+                    "name": "Nordea",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Phillips 66",
-                "icon": "fuel",
+                "name": "Nordea",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Phoenix": {
+            "amenity/bank/Rabobank": {
                 "tags": {
                 "tags": {
-                    "name": "Phoenix",
-                    "amenity": "fuel"
+                    "name": "Rabobank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Phoenix",
-                "icon": "fuel",
+                "name": "Rabobank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Q8": {
+            "amenity/bank/Sparkasse KölnBonn": {
                 "tags": {
                 "tags": {
-                    "name": "Q8",
-                    "amenity": "fuel"
+                    "name": "Sparkasse KölnBonn",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Q8",
-                "icon": "fuel",
+                "name": "Sparkasse KölnBonn",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/QuikTrip": {
+            "amenity/bank/Tatra banka": {
                 "tags": {
                 "tags": {
-                    "name": "QuikTrip",
-                    "amenity": "fuel"
+                    "name": "Tatra banka",
+                    "amenity": "bank"
                 },
                 },
-                "name": "QuikTrip",
-                "icon": "fuel",
+                "name": "Tatra banka",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/REPSOL": {
+            "amenity/bank/Berliner Sparkasse": {
                 "tags": {
                 "tags": {
-                    "name": "REPSOL",
-                    "amenity": "fuel"
+                    "name": "Berliner Sparkasse",
+                    "amenity": "bank"
                 },
                 },
-                "name": "REPSOL",
-                "icon": "fuel",
+                "name": "Berliner Sparkasse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Repsol": {
+            "amenity/bank/Berliner Volksbank": {
                 "tags": {
                 "tags": {
-                    "name": "Repsol",
-                    "amenity": "fuel"
+                    "name": "Berliner Volksbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Repsol",
-                "icon": "fuel",
+                "name": "Berliner Volksbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Rompetrol": {
+            "amenity/bank/Wells Fargo": {
                 "tags": {
                 "tags": {
-                    "name": "Rompetrol",
-                    "amenity": "fuel"
+                    "name": "Wells Fargo",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Rompetrol",
-                "icon": "fuel",
+                "name": "Wells Fargo",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Shell": {
+            "amenity/bank/Credit Suisse": {
                 "tags": {
                 "tags": {
-                    "name": "Shell",
-                    "amenity": "fuel"
+                    "name": "Credit Suisse",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Shell",
-                "icon": "fuel",
+                "name": "Credit Suisse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sainsbury's": {
+            "amenity/bank/Société Générale": {
                 "tags": {
                 "tags": {
-                    "name": "Sainsbury's",
-                    "amenity": "fuel"
+                    "name": "Société Générale",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Sainsbury's",
-                "icon": "fuel",
+                "name": "Société Générale",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sasol": {
+            "amenity/bank/Osuuspankki": {
                 "tags": {
                 "tags": {
-                    "name": "Sasol",
-                    "amenity": "fuel"
+                    "name": "Osuuspankki",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Sasol",
-                "icon": "fuel",
+                "name": "Osuuspankki",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sheetz": {
+            "amenity/bank/Sparkasse Aachen": {
                 "tags": {
                 "tags": {
-                    "name": "Sheetz",
-                    "amenity": "fuel"
+                    "name": "Sparkasse Aachen",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Sheetz",
-                "icon": "fuel",
+                "name": "Sparkasse Aachen",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Shell Express": {
+            "amenity/bank/Hamburger Sparkasse": {
                 "tags": {
                 "tags": {
-                    "name": "Shell Express",
-                    "amenity": "fuel"
+                    "name": "Hamburger Sparkasse",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Shell Express",
-                "icon": "fuel",
+                "name": "Hamburger Sparkasse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sinclair": {
+            "amenity/bank/Cassa di Risparmio del Veneto": {
                 "tags": {
                 "tags": {
-                    "name": "Sinclair",
-                    "amenity": "fuel"
+                    "name": "Cassa di Risparmio del Veneto",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Sinclair",
-                "icon": "fuel",
+                "name": "Cassa di Risparmio del Veneto",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Slovnaft": {
+            "amenity/bank/BNP Paribas": {
                 "tags": {
                 "tags": {
-                    "name": "Slovnaft",
-                    "amenity": "fuel"
+                    "name": "BNP Paribas",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Slovnaft",
-                "icon": "fuel",
+                "name": "BNP Paribas",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sokimex": {
+            "amenity/bank/Banque Populaire": {
                 "tags": {
                 "tags": {
-                    "name": "Sokimex",
-                    "amenity": "fuel"
+                    "name": "Banque Populaire",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Sokimex",
-                "icon": "fuel",
+                "name": "Banque Populaire",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Speedway": {
+            "amenity/bank/BNP Paribas Fortis": {
                 "tags": {
                 "tags": {
-                    "name": "Speedway",
-                    "amenity": "fuel"
+                    "name": "BNP Paribas Fortis",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Speedway",
-                "icon": "fuel",
+                "name": "BNP Paribas Fortis",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/St1": {
+            "amenity/bank/Banco Popular": {
                 "tags": {
                 "tags": {
-                    "name": "St1",
-                    "amenity": "fuel"
+                    "name": "Banco Popular",
+                    "amenity": "bank"
                 },
                 },
-                "name": "St1",
-                "icon": "fuel",
+                "name": "Banco Popular",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Stacja paliw": {
+            "amenity/bank/Bancaja": {
                 "tags": {
                 "tags": {
-                    "name": "Stacja paliw",
-                    "amenity": "fuel"
+                    "name": "Bancaja",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Stacja paliw",
-                "icon": "fuel",
+                "name": "Bancaja",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Star": {
+            "amenity/bank/Banesto": {
                 "tags": {
                 "tags": {
-                    "name": "Star",
-                    "amenity": "fuel"
+                    "name": "Banesto",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Star",
-                "icon": "fuel",
+                "name": "Banesto",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Total": {
+            "amenity/bank/La Caixa": {
                 "tags": {
                 "tags": {
-                    "name": "Total",
-                    "amenity": "fuel"
+                    "name": "La Caixa",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Total",
-                "icon": "fuel",
+                "name": "La Caixa",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Statoil": {
+            "amenity/bank/Santander Consumer Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Statoil",
-                    "amenity": "fuel"
+                    "name": "Santander Consumer Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Statoil",
-                "icon": "fuel",
+                "name": "Santander Consumer Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Stewart's": {
+            "amenity/bank/BRD": {
                 "tags": {
                 "tags": {
-                    "name": "Stewart's",
-                    "amenity": "fuel"
+                    "name": "BRD",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Stewart's",
-                "icon": "fuel",
+                "name": "BRD",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sunoco": {
+            "amenity/bank/BCR": {
                 "tags": {
                 "tags": {
-                    "name": "Sunoco",
-                    "amenity": "fuel"
+                    "name": "BCR",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Sunoco",
-                "icon": "fuel",
+                "name": "BCR",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Super U": {
+            "amenity/bank/Banca Transilvania": {
                 "tags": {
                 "tags": {
-                    "name": "Super U",
-                    "amenity": "fuel"
+                    "name": "Banca Transilvania",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Super U",
-                "icon": "fuel",
+                "name": "Banca Transilvania",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tamoil": {
+            "amenity/bank/BW-Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Tamoil",
-                    "amenity": "fuel"
+                    "name": "BW-Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Tamoil",
-                "icon": "fuel",
+                "name": "BW-Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tango": {
+            "amenity/bank/Komerční banka": {
                 "tags": {
                 "tags": {
-                    "name": "Tango",
-                    "amenity": "fuel"
+                    "name": "Komerční banka",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Tango",
-                "icon": "fuel",
+                "name": "Komerční banka",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tankstelle": {
+            "amenity/bank/Banco Pastor": {
                 "tags": {
                 "tags": {
-                    "name": "Tankstelle",
-                    "amenity": "fuel"
+                    "name": "Banco Pastor",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Tankstelle",
-                "icon": "fuel",
+                "name": "Banco Pastor",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Teboil": {
+            "amenity/bank/Stadtsparkasse": {
                 "tags": {
                 "tags": {
-                    "name": "Teboil",
-                    "amenity": "fuel"
-                },
-                "name": "Teboil",
-                "icon": "fuel",
+                    "name": "Stadtsparkasse",
+                    "amenity": "bank"
+                },
+                "name": "Stadtsparkasse",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tela": {
+            "amenity/bank/Ulster Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Tela",
-                    "amenity": "fuel"
+                    "name": "Ulster Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Tela",
-                "icon": "fuel",
+                "name": "Ulster Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Terpel": {
+            "amenity/bank/Sberbank": {
                 "tags": {
                 "tags": {
-                    "name": "Terpel",
-                    "amenity": "fuel"
+                    "name": "Sberbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Terpel",
-                "icon": "fuel",
+                "name": "Sberbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tesco": {
+            "amenity/bank/CIC": {
                 "tags": {
                 "tags": {
-                    "name": "Tesco",
-                    "amenity": "fuel"
+                    "name": "CIC",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Tesco",
-                "icon": "fuel",
+                "name": "CIC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Texaco": {
+            "amenity/bank/Bancpost": {
                 "tags": {
                 "tags": {
-                    "name": "Texaco",
-                    "amenity": "fuel"
+                    "name": "Bancpost",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Texaco",
-                "icon": "fuel",
+                "name": "Bancpost",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tinq": {
+            "amenity/bank/Caja Madrid": {
                 "tags": {
                 "tags": {
-                    "name": "Tinq",
-                    "amenity": "fuel"
+                    "name": "Caja Madrid",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Tinq",
-                "icon": "fuel",
+                "name": "Caja Madrid",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Topaz": {
+            "amenity/bank/Maybank": {
                 "tags": {
                 "tags": {
-                    "name": "Topaz",
-                    "amenity": "fuel"
+                    "name": "Maybank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Topaz",
-                "icon": "fuel",
+                "name": "Maybank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/TotalErg": {
+            "amenity/bank/中国银行": {
                 "tags": {
                 "tags": {
-                    "name": "TotalErg",
-                    "amenity": "fuel"
+                    "name": "中国银行",
+                    "amenity": "bank"
                 },
                 },
-                "name": "TotalErg",
-                "icon": "fuel",
+                "name": "中国银行",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Turmöl": {
+            "amenity/bank/Unicredit Banca": {
                 "tags": {
                 "tags": {
-                    "name": "Turmöl",
-                    "amenity": "fuel"
+                    "name": "Unicredit Banca",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Turmöl",
-                "icon": "fuel",
+                "name": "Unicredit Banca",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Ultramar": {
+            "amenity/bank/Crédit Mutuel": {
                 "tags": {
                 "tags": {
-                    "name": "Ultramar",
-                    "amenity": "fuel"
+                    "name": "Crédit Mutuel",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Ultramar",
-                "icon": "fuel",
+                "name": "Crédit Mutuel",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/United": {
+            "amenity/bank/BBVA": {
                 "tags": {
                 "tags": {
-                    "name": "United",
-                    "amenity": "fuel"
+                    "name": "BBVA",
+                    "amenity": "bank"
                 },
                 },
-                "name": "United",
-                "icon": "fuel",
+                "name": "BBVA",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Valero": {
+            "amenity/bank/Intesa San Paolo": {
                 "tags": {
                 "tags": {
-                    "name": "Valero",
-                    "amenity": "fuel"
+                    "name": "Intesa San Paolo",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Valero",
-                "icon": "fuel",
+                "name": "Intesa San Paolo",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/WOG": {
+            "amenity/bank/TD Bank": {
                 "tags": {
                 "tags": {
-                    "name": "WOG",
-                    "amenity": "fuel"
+                    "name": "TD Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "WOG",
-                "icon": "fuel",
+                "name": "TD Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Wawa": {
+            "amenity/bank/Belfius": {
                 "tags": {
                 "tags": {
-                    "name": "Wawa",
-                    "amenity": "fuel"
+                    "name": "Belfius",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Wawa",
-                "icon": "fuel",
+                "name": "Belfius",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Westfalen": {
+            "amenity/bank/Bank of America": {
                 "tags": {
                 "tags": {
-                    "name": "Westfalen",
-                    "amenity": "fuel"
+                    "name": "Bank of America",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Westfalen",
-                "icon": "fuel",
+                "name": "Bank of America",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/YPF": {
+            "amenity/bank/RBC": {
                 "tags": {
                 "tags": {
-                    "name": "YPF",
-                    "amenity": "fuel"
+                    "name": "RBC",
+                    "amenity": "bank"
                 },
                 },
-                "name": "YPF",
-                "icon": "fuel",
+                "name": "RBC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Z": {
+            "amenity/bank/Alpha Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Z",
-                    "amenity": "fuel"
+                    "name": "Alpha Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Z",
-                "icon": "fuel",
+                "name": "Alpha Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/bft": {
+            "amenity/bank/Сбербанк": {
                 "tags": {
                 "tags": {
-                    "name": "bft",
-                    "amenity": "fuel"
+                    "name": "Сбербанк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "bft",
-                "icon": "fuel",
+                "name": "Сбербанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ÖMV": {
+            "amenity/bank/Россельхозбанк": {
                 "tags": {
                 "tags": {
-                    "name": "ÖMV",
-                    "amenity": "fuel"
+                    "name": "Россельхозбанк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ÖMV",
-                "icon": "fuel",
+                "name": "Россельхозбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/АГЗС": {
+            "amenity/bank/Crédit du Nord": {
                 "tags": {
                 "tags": {
-                    "name": "АГЗС",
-                    "amenity": "fuel"
+                    "name": "Crédit du Nord",
+                    "amenity": "bank"
                 },
                 },
-                "name": "АГЗС",
-                "icon": "fuel",
+                "name": "Crédit du Nord",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/АЗС": {
+            "amenity/bank/BancoEstado": {
                 "tags": {
                 "tags": {
-                    "name": "АЗС",
-                    "amenity": "fuel"
+                    "name": "BancoEstado",
+                    "amenity": "bank"
                 },
                 },
-                "name": "АЗС",
-                "icon": "fuel",
+                "name": "BancoEstado",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Башнефть": {
+            "amenity/bank/Millennium Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Башнефть",
-                    "amenity": "fuel"
+                    "name": "Millennium Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Башнефть",
-                "icon": "fuel",
+                "name": "Millennium Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Белоруснефть": {
+            "amenity/bank/State Bank of India": {
                 "tags": {
                 "tags": {
-                    "name": "Белоруснефть",
-                    "amenity": "fuel"
+                    "name": "State Bank of India",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Белоруснефть",
-                "icon": "fuel",
+                "name": "State Bank of India",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Газпромнефть": {
+            "amenity/bank/Беларусбанк": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\93азпÑ\80омнеÑ\84Ñ\82Ñ\8c",
-                    "amenity": "fuel"
+                    "name": "Ð\91елаÑ\80Ñ\83Ñ\81банк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Ð\93азпÑ\80омнеÑ\84Ñ\82Ñ\8c",
-                "icon": "fuel",
+                "name": "Ð\91елаÑ\80Ñ\83Ñ\81банк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Лукойл": {
+            "amenity/bank/ING Bank Śląski": {
                 "tags": {
                 "tags": {
-                    "name": "Лукойл",
-                    "amenity": "fuel"
+                    "name": "ING Bank Śląski",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Лукойл",
-                "icon": "fuel",
+                "name": "ING Bank Śląski",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Макпетрол": {
+            "amenity/bank/Caixa Geral de Depósitos": {
                 "tags": {
                 "tags": {
-                    "name": "Макпетрол",
-                    "amenity": "fuel"
+                    "name": "Caixa Geral de Depósitos",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Макпетрол",
-                "icon": "fuel",
+                "name": "Caixa Geral de Depósitos",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/НК Альянс": {
+            "amenity/bank/Kreissparkasse Köln": {
                 "tags": {
                 "tags": {
-                    "name": "НК Альянс",
-                    "amenity": "fuel"
+                    "name": "Kreissparkasse Köln",
+                    "amenity": "bank"
                 },
                 },
-                "name": "НК Альянс",
-                "icon": "fuel",
+                "name": "Kreissparkasse Köln",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ОККО": {
+            "amenity/bank/Banco BCI": {
                 "tags": {
                 "tags": {
-                    "name": "ОККО",
-                    "amenity": "fuel"
+                    "name": "Banco BCI",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ОККО",
-                "icon": "fuel",
+                "name": "Banco BCI",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ОМВ": {
+            "amenity/bank/Banco de Chile": {
                 "tags": {
                 "tags": {
-                    "name": "ОМВ",
-                    "amenity": "fuel"
+                    "name": "Banco de Chile",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ОМВ",
-                "icon": "fuel",
+                "name": "Banco de Chile",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ПТК": {
+            "amenity/bank/ВТБ24": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\9fТÐ\9a",
-                    "amenity": "fuel"
+                    "name": "Ð\92ТÐ\9124",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Ð\9fТÐ\9a",
-                "icon": "fuel",
+                "name": "Ð\92ТÐ\9124",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Петрол": {
+            "amenity/bank/UBS": {
                 "tags": {
                 "tags": {
-                    "name": "Петрол",
-                    "amenity": "fuel"
+                    "name": "UBS",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Петрол",
-                "icon": "fuel",
+                "name": "UBS",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Роснефть": {
+            "amenity/bank/PKO BP": {
                 "tags": {
                 "tags": {
-                    "name": "Роснефть",
-                    "amenity": "fuel"
+                    "name": "PKO BP",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Роснефть",
-                "icon": "fuel",
+                "name": "PKO BP",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Славнефть": {
+            "amenity/bank/Chinabank": {
                 "tags": {
                 "tags": {
-                    "name": "Славнефть",
-                    "amenity": "fuel"
+                    "name": "Chinabank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Славнефть",
-                "icon": "fuel",
+                "name": "Chinabank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Сургутнефтегаз": {
+            "amenity/bank/PSBank": {
                 "tags": {
                 "tags": {
-                    "name": "Сургутнефтегаз",
-                    "amenity": "fuel"
+                    "name": "PSBank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Сургутнефтегаз",
-                "icon": "fuel",
+                "name": "PSBank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ТНК": {
+            "amenity/bank/Union Bank": {
                 "tags": {
                 "tags": {
-                    "name": "ТНК",
-                    "amenity": "fuel"
+                    "name": "Union Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ТНК",
-                "icon": "fuel",
+                "name": "Union Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Татнефтепродукт": {
+            "amenity/bank/China Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Татнефтепродукт",
-                    "amenity": "fuel"
+                    "name": "China Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Татнефтепродукт",
-                "icon": "fuel",
+                "name": "China Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Татнефть": {
+            "amenity/bank/RCBC": {
                 "tags": {
                 "tags": {
-                    "name": "Татнефть",
-                    "amenity": "fuel"
+                    "name": "RCBC",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Татнефть",
-                "icon": "fuel",
+                "name": "RCBC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/บางจาก": {
+            "amenity/bank/Unicaja": {
                 "tags": {
                 "tags": {
-                    "name": "บางจาก",
-                    "amenity": "fuel"
+                    "name": "Unicaja",
+                    "amenity": "bank"
                 },
                 },
-                "name": "บางจาก",
-                "icon": "fuel",
+                "name": "Unicaja",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ป ต ท": {
+            "amenity/bank/BBK": {
                 "tags": {
                 "tags": {
-                    "name": "ป ต ท",
-                    "amenity": "fuel"
+                    "name": "BBK",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ป ต ท",
-                "icon": "fuel",
+                "name": "BBK",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ปตท": {
+            "amenity/bank/Ibercaja": {
                 "tags": {
                 "tags": {
-                    "name": "ปตท",
-                    "amenity": "fuel"
+                    "name": "Ibercaja",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ปตท",
-                "icon": "fuel",
+                "name": "Ibercaja",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/コスモ石油 (COSMO)": {
+            "amenity/bank/RBS": {
                 "tags": {
                 "tags": {
-                    "name": "コスモ石油 (COSMO)",
-                    "amenity": "fuel"
+                    "name": "RBS",
+                    "amenity": "bank"
                 },
                 },
-                "name": "コスモ石油 (COSMO)",
-                "icon": "fuel",
+                "name": "RBS",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/出光": {
+            "amenity/bank/Commercial Bank of Ceylon PLC": {
                 "tags": {
                 "tags": {
-                    "name": "出光",
-                    "name:en": "IDEMITSU",
-                    "amenity": "fuel"
+                    "name": "Commercial Bank of Ceylon PLC",
+                    "amenity": "bank"
                 },
                 },
-                "name": "出光",
-                "icon": "fuel",
+                "name": "Commercial Bank of Ceylon PLC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/昭和シェル (Showa-shell)": {
+            "amenity/bank/Bank of Ireland": {
                 "tags": {
                 "tags": {
-                    "name": "昭和シェル (Showa-shell)",
-                    "amenity": "fuel"
+                    "name": "Bank of Ireland",
+                    "amenity": "bank"
                 },
                 },
-                "name": "昭和シェル (Showa-shell)",
-                "icon": "fuel",
+                "name": "Bank of Ireland",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
+                    "building_area",
                     "address",
                     "address",
-                    "building_area"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Аптека 36,6": {
+            "amenity/bank/BNL": {
                 "tags": {
                 "tags": {
-                    "name": "Аптека 36,6",
-                    "amenity": "pharmacy"
+                    "name": "BNL",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Аптека 36,6",
-                "icon": "pharmacy",
+                "name": "BNL",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Adler Apotheke": {
+            "amenity/bank/Banco Santander": {
                 "tags": {
                 "tags": {
-                    "name": "Adler Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Banco Santander",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Adler Apotheke",
-                "icon": "pharmacy",
+                "name": "Banco Santander",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Alte Apotheke": {
+            "amenity/bank/Banco Itaú": {
                 "tags": {
                 "tags": {
-                    "name": "Alte Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Banco Itaú",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Alte Apotheke",
-                "icon": "pharmacy",
+                "name": "Banco Itaú",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Apotheke": {
+            "amenity/bank/AIB": {
                 "tags": {
                 "tags": {
-                    "name": "Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "AIB",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Apotheke",
-                "icon": "pharmacy",
+                "name": "AIB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Apotheke am Markt": {
+            "amenity/bank/BZ WBK": {
                 "tags": {
                 "tags": {
-                    "name": "Apotheke am Markt",
-                    "amenity": "pharmacy"
+                    "name": "BZ WBK",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Apotheke am Markt",
-                "icon": "pharmacy",
+                "name": "BZ WBK",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Apteka": {
+            "amenity/bank/Banco do Brasil": {
                 "tags": {
                 "tags": {
-                    "name": "Apteka",
-                    "amenity": "pharmacy"
+                    "name": "Banco do Brasil",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Apteka",
-                "icon": "pharmacy",
+                "name": "Banco do Brasil",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Bahnhof-Apotheke": {
+            "amenity/bank/Caixa Econômica Federal": {
                 "tags": {
                 "tags": {
-                    "name": "Bahnhof-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Caixa Econômica Federal",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Bahnhof-Apotheke",
-                "icon": "pharmacy",
+                "name": "Caixa Econômica Federal",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Boots": {
+            "amenity/bank/Fifth Third Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Boots",
-                    "amenity": "pharmacy"
+                    "name": "Fifth Third Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Boots",
-                "icon": "pharmacy",
+                "name": "Fifth Third Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Brunnen-Apotheke": {
+            "amenity/bank/Banca Popolare di Vicenza": {
                 "tags": {
                 "tags": {
-                    "name": "Brunnen-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Banca Popolare di Vicenza",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Brunnen-Apotheke",
-                "icon": "pharmacy",
+                "name": "Banca Popolare di Vicenza",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Burg-Apotheke": {
+            "amenity/bank/Wachovia": {
                 "tags": {
                 "tags": {
-                    "name": "Burg-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Wachovia",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Burg-Apotheke",
-                "icon": "pharmacy",
+                "name": "Wachovia",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Bären-Apotheke": {
+            "amenity/bank/OLB": {
                 "tags": {
                 "tags": {
-                    "name": "Bären-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "OLB",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Bären-Apotheke",
-                "icon": "pharmacy",
+                "name": "OLB",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/CVS": {
+            "amenity/bank/みずほ銀行": {
                 "tags": {
                 "tags": {
-                    "name": "CVS",
-                    "amenity": "pharmacy"
+                    "name": "みずほ銀行",
+                    "amenity": "bank"
                 },
                 },
-                "name": "CVS",
-                "icon": "pharmacy",
+                "name": "みずほ銀行",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Clicks": {
+            "amenity/bank/BES": {
                 "tags": {
                 "tags": {
-                    "name": "Clicks",
-                    "amenity": "pharmacy"
+                    "name": "BES",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Clicks",
-                "icon": "pharmacy",
+                "name": "BES",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Cruz Verde": {
+            "amenity/bank/ICICI Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Cruz Verde",
-                    "amenity": "pharmacy"
+                    "name": "ICICI Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Cruz Verde",
-                "icon": "pharmacy",
+                "name": "ICICI Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Engel-Apotheke": {
+            "amenity/bank/HDFC Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Engel-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "HDFC Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Engel-Apotheke",
-                "icon": "pharmacy",
+                "name": "HDFC Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Eurovaistinė": {
+            "amenity/bank/La Banque Postale": {
                 "tags": {
                 "tags": {
-                    "name": "Eurovaistinė",
-                    "amenity": "pharmacy"
+                    "name": "La Banque Postale",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Eurovaistinė",
-                "icon": "pharmacy",
+                "name": "La Banque Postale",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmacia Comunale": {
+            "amenity/bank/Pekao SA": {
                 "tags": {
                 "tags": {
-                    "name": "Farmacia Comunale",
-                    "amenity": "pharmacy"
+                    "name": "Pekao SA",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Farmacia Comunale",
-                "icon": "pharmacy",
+                "name": "Pekao SA",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmacias Ahumada": {
+            "amenity/bank/Oberbank": {
                 "tags": {
                 "tags": {
-                    "name": "Farmacias Ahumada",
-                    "amenity": "pharmacy"
+                    "name": "Oberbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Farmacias Ahumada",
-                "icon": "pharmacy",
+                "name": "Oberbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmacias Cruz Verde": {
+            "amenity/bank/Bradesco": {
                 "tags": {
                 "tags": {
-                    "name": "Farmacias Cruz Verde",
-                    "amenity": "pharmacy"
+                    "name": "Bradesco",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Farmacias Cruz Verde",
-                "icon": "pharmacy",
+                "name": "Bradesco",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmacias SalcoBrand": {
+            "amenity/bank/Oldenburgische Landesbank": {
                 "tags": {
                 "tags": {
-                    "name": "Farmacias SalcoBrand",
-                    "amenity": "pharmacy"
+                    "name": "Oldenburgische Landesbank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Farmacias SalcoBrand",
-                "icon": "pharmacy",
+                "name": "Oldenburgische Landesbank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmacity": {
+            "amenity/bank/Scotia Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Farmacity",
-                    "amenity": "pharmacy"
+                    "name": "Scotia Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Farmacity",
-                "icon": "pharmacy",
+                "name": "Scotia Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmahorro": {
+            "amenity/bank/Bendigo Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Farmahorro",
-                    "amenity": "pharmacy"
+                    "name": "Bendigo Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Farmahorro",
-                "icon": "pharmacy",
+                "name": "Bendigo Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Farmatodo": {
+            "amenity/bank/Argenta": {
                 "tags": {
                 "tags": {
-                    "name": "Farmatodo",
-                    "amenity": "pharmacy"
+                    "name": "Argenta",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Farmatodo",
-                "icon": "pharmacy",
+                "name": "Argenta",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Gintarinė vaistinė": {
+            "amenity/bank/AXA": {
                 "tags": {
                 "tags": {
-                    "name": "Gintarinė vaistinė",
-                    "amenity": "pharmacy"
+                    "name": "AXA",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Gintarinė vaistinė",
-                "icon": "pharmacy",
+                "name": "AXA",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Hirsch-Apotheke": {
+            "amenity/bank/Axis Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Hirsch-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Axis Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Hirsch-Apotheke",
-                "icon": "pharmacy",
+                "name": "Axis Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Hubertus Apotheke": {
+            "amenity/bank/Banco Nación": {
                 "tags": {
                 "tags": {
-                    "name": "Hubertus Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Banco Nación",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Hubertus Apotheke",
-                "icon": "pharmacy",
+                "name": "Banco Nación",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Jean Coutu": {
+            "amenity/bank/GE Money Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Jean Coutu",
-                    "amenity": "pharmacy"
+                    "name": "GE Money Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Jean Coutu",
-                "icon": "pharmacy",
+                "name": "GE Money Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Kinney Drugs": {
+            "amenity/bank/Альфа-Банк": {
                 "tags": {
                 "tags": {
-                    "name": "Kinney Drugs",
-                    "amenity": "pharmacy"
+                    "name": "Альфа-Банк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Kinney Drugs",
-                "icon": "pharmacy",
+                "name": "Альфа-Банк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Linden-Apotheke": {
+            "amenity/bank/Белагропромбанк": {
                 "tags": {
                 "tags": {
-                    "name": "Linden-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Белагропромбанк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Linden-Apotheke",
-                "icon": "pharmacy",
+                "name": "Белагропромбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Ljekarna": {
+            "amenity/bank/Caja Círculo": {
                 "tags": {
                 "tags": {
-                    "name": "Ljekarna",
-                    "amenity": "pharmacy"
+                    "name": "Caja Círculo",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Ljekarna",
-                "icon": "pharmacy",
+                "name": "Caja Círculo",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Lloyds Pharmacy": {
+            "amenity/bank/Eurobank": {
                 "tags": {
                 "tags": {
-                    "name": "Lloyds Pharmacy",
-                    "amenity": "pharmacy"
+                    "name": "Eurobank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Lloyds Pharmacy",
-                "icon": "pharmacy",
+                "name": "Eurobank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Löwen-Apotheke": {
+            "amenity/bank/Banca Intesa": {
                 "tags": {
                 "tags": {
-                    "name": "Löwen-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Banca Intesa",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Löwen-Apotheke",
-                "icon": "pharmacy",
+                "name": "Banca Intesa",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Marien-Apotheke": {
+            "amenity/bank/Canara Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Marien-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Canara Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Marien-Apotheke",
-                "icon": "pharmacy",
+                "name": "Canara Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Markt-Apotheke": {
+            "amenity/bank/Cajamar": {
                 "tags": {
                 "tags": {
-                    "name": "Markt-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Cajamar",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Markt-Apotheke",
-                "icon": "pharmacy",
+                "name": "Cajamar",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Mercury Drug": {
+            "amenity/bank/Banamex": {
                 "tags": {
                 "tags": {
-                    "name": "Mercury Drug",
-                    "amenity": "pharmacy"
+                    "name": "Banamex",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Mercury Drug",
-                "icon": "pharmacy",
+                "name": "Banamex",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Neue Apotheke": {
+            "amenity/bank/Crédit Mutuel de Bretagne": {
                 "tags": {
                 "tags": {
-                    "name": "Neue Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Crédit Mutuel de Bretagne",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Neue Apotheke",
-                "icon": "pharmacy",
+                "name": "Crédit Mutuel de Bretagne",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Pharmacie Centrale": {
+            "amenity/bank/Davivienda": {
                 "tags": {
                 "tags": {
-                    "name": "Pharmacie Centrale",
-                    "amenity": "pharmacy"
+                    "name": "Davivienda",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Pharmacie Centrale",
-                "icon": "pharmacy",
+                "name": "Davivienda",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Pharmaprix": {
+            "amenity/bank/Bank Spółdzielczy": {
                 "tags": {
                 "tags": {
-                    "name": "Pharmaprix",
-                    "amenity": "pharmacy"
+                    "name": "Bank Spółdzielczy",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Pharmaprix",
-                "icon": "pharmacy",
+                "name": "Bank Spółdzielczy",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Pharmasave": {
+            "amenity/bank/Credit Agricole": {
                 "tags": {
                 "tags": {
-                    "name": "Pharmasave",
-                    "amenity": "pharmacy"
+                    "name": "Credit Agricole",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Pharmasave",
-                "icon": "pharmacy",
+                "name": "Credit Agricole",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Rathaus-Apotheke": {
+            "amenity/bank/Bankinter": {
                 "tags": {
                 "tags": {
-                    "name": "Rathaus-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Bankinter",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Rathaus-Apotheke",
-                "icon": "pharmacy",
+                "name": "Bankinter",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Rats-Apotheke": {
+            "amenity/bank/Banque Nationale": {
                 "tags": {
                 "tags": {
-                    "name": "Rats-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Banque Nationale",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Rats-Apotheke",
-                "icon": "pharmacy",
+                "name": "Banque Nationale",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Rite Aid": {
+            "amenity/bank/Bank of the West": {
                 "tags": {
                 "tags": {
-                    "name": "Rite Aid",
-                    "amenity": "pharmacy"
+                    "name": "Bank of the West",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Rite Aid",
-                "icon": "pharmacy",
+                "name": "Bank of the West",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Rosen-Apotheke": {
+            "amenity/bank/Key Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Rosen-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Key Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Rosen-Apotheke",
-                "icon": "pharmacy",
+                "name": "Key Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Rowlands Pharmacy": {
+            "amenity/bank/Western Union": {
                 "tags": {
                 "tags": {
-                    "name": "Rowlands Pharmacy",
-                    "amenity": "pharmacy"
+                    "name": "Western Union",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Rowlands Pharmacy",
-                "icon": "pharmacy",
+                "name": "Western Union",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/SalcoBrand": {
+            "amenity/bank/Citizens Bank": {
                 "tags": {
                 "tags": {
-                    "name": "SalcoBrand",
-                    "amenity": "pharmacy"
+                    "name": "Citizens Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "SalcoBrand",
-                "icon": "pharmacy",
+                "name": "Citizens Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Shoppers Drug Mart": {
+            "amenity/bank/ПриватБанк": {
                 "tags": {
                 "tags": {
-                    "name": "Shoppers Drug Mart",
-                    "amenity": "pharmacy"
+                    "name": "ПриватБанк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Shoppers Drug Mart",
-                "icon": "pharmacy",
+                "name": "ПриватБанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Sonnen-Apotheke": {
+            "amenity/bank/Security Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Sonnen-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Security Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Sonnen-Apotheke",
-                "icon": "pharmacy",
+                "name": "Security Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Stadt-Apotheke": {
+            "amenity/bank/Ecobank": {
                 "tags": {
                 "tags": {
-                    "name": "Stadt-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Ecobank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Stadt-Apotheke",
-                "icon": "pharmacy",
+                "name": "Ecobank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Stern-Apotheke": {
+            "amenity/bank/Millenium Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Stern-Apotheke",
-                    "amenity": "pharmacy"
+                    "name": "Millenium Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Stern-Apotheke",
-                "icon": "pharmacy",
+                "name": "Millenium Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Superdrug": {
+            "amenity/bank/Bankia": {
                 "tags": {
                 "tags": {
-                    "name": "Superdrug",
-                    "amenity": "pharmacy"
+                    "name": "Bankia",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Superdrug",
-                "icon": "pharmacy",
+                "name": "Bankia",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/The Generics Pharmacy": {
+            "amenity/bank/三菱東京UFJ銀行": {
                 "tags": {
                 "tags": {
-                    "name": "The Generics Pharmacy",
-                    "amenity": "pharmacy"
+                    "name": "三菱東京UFJ銀行",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Generics Pharmacy",
-                "icon": "pharmacy",
+                "name": "三菱東京UFJ銀行",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Walgreens": {
+            "amenity/bank/Caixa": {
                 "tags": {
                 "tags": {
-                    "name": "Walgreens",
-                    "amenity": "pharmacy"
+                    "name": "Caixa",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Walgreens",
-                "icon": "pharmacy",
+                "name": "Caixa",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Айболит": {
+            "amenity/bank/Banco de Costa Rica": {
                 "tags": {
                 "tags": {
-                    "name": "Айболит",
-                    "amenity": "pharmacy"
+                    "name": "Banco de Costa Rica",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Айболит",
-                "icon": "pharmacy",
+                "name": "Banco de Costa Rica",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Аптека": {
+            "amenity/bank/SunTrust Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Аптека",
-                    "amenity": "pharmacy"
+                    "name": "SunTrust Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Аптека",
-                "icon": "pharmacy",
+                "name": "SunTrust Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Аптечный пункт": {
+            "amenity/bank/Itaú": {
                 "tags": {
                 "tags": {
-                    "name": "Аптечный пункт",
-                    "amenity": "pharmacy"
+                    "name": "Itaú",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Аптечный пункт",
-                "icon": "pharmacy",
+                "name": "Itaú",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Вита": {
+            "amenity/bank/PBZ": {
                 "tags": {
                 "tags": {
-                    "name": "Вита",
-                    "amenity": "pharmacy"
+                    "name": "PBZ",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Вита",
-                "icon": "pharmacy",
+                "name": "PBZ",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Имплозия": {
+            "amenity/bank/Bancolombia": {
                 "tags": {
                 "tags": {
-                    "name": "Имплозия",
-                    "amenity": "pharmacy"
+                    "name": "Bancolombia",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Имплозия",
-                "icon": "pharmacy",
+                "name": "Bancolombia",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Классика": {
+            "amenity/bank/Райффайзен Банк Аваль": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\9aлаÑ\81Ñ\81ика",
-                    "amenity": "pharmacy"
+                    "name": "РайÑ\84Ñ\84айзен Ð\91анк Ð\90валÑ\8c",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Ð\9aлаÑ\81Ñ\81ика",
-                "icon": "pharmacy",
+                "name": "РайÑ\84Ñ\84айзен Ð\91анк Ð\90валÑ\8c",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Невис": {
+            "amenity/bank/Bancomer": {
                 "tags": {
                 "tags": {
-                    "name": "Невис",
-                    "amenity": "pharmacy"
+                    "name": "Bancomer",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Невис",
-                "icon": "pharmacy",
+                "name": "Bancomer",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Первая помощь": {
+            "amenity/bank/Banorte": {
                 "tags": {
                 "tags": {
-                    "name": "Первая помощь",
-                    "amenity": "pharmacy"
+                    "name": "Banorte",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Первая помощь",
-                "icon": "pharmacy",
+                "name": "Banorte",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Радуга": {
+            "amenity/bank/Alior Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Радуга",
-                    "amenity": "pharmacy"
+                    "name": "Alior Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Радуга",
-                "icon": "pharmacy",
+                "name": "Alior Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Ригла": {
+            "amenity/bank/BOC": {
                 "tags": {
                 "tags": {
-                    "name": "Ригла",
-                    "amenity": "pharmacy"
+                    "name": "BOC",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Ригла",
-                "icon": "pharmacy",
+                "name": "BOC",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Фармакор": {
+            "amenity/bank/Банк Москвы": {
                 "tags": {
                 "tags": {
-                    "name": "ФаÑ\80макоÑ\80",
-                    "amenity": "pharmacy"
+                    "name": "Ð\91анк Ð\9cоÑ\81квÑ\8b",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ФаÑ\80макоÑ\80",
-                "icon": "pharmacy",
+                "name": "Ð\91анк Ð\9cоÑ\81квÑ\8b",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Фармация": {
+            "amenity/bank/ВТБ": {
                 "tags": {
                 "tags": {
-                    "name": "ФаÑ\80маÑ\86иÑ\8f",
-                    "amenity": "pharmacy"
+                    "name": "Ð\92ТÐ\91",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ФаÑ\80маÑ\86иÑ\8f",
-                "icon": "pharmacy",
+                "name": "Ð\92ТÐ\91",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Фармленд": {
+            "amenity/bank/Caja Duero": {
                 "tags": {
                 "tags": {
-                    "name": "Фармленд",
-                    "amenity": "pharmacy"
+                    "name": "Caja Duero",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Фармленд",
-                "icon": "pharmacy",
+                "name": "Caja Duero",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/аптека": {
+            "amenity/bank/Regions Bank": {
                 "tags": {
                 "tags": {
-                    "name": "аптека",
-                    "amenity": "pharmacy"
+                    "name": "Regions Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "аптека",
-                "icon": "pharmacy",
+                "name": "Regions Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/ავერსი (Aversi)": {
+            "amenity/bank/Росбанк": {
                 "tags": {
                 "tags": {
-                    "name": "ავერსი (Aversi)",
-                    "amenity": "pharmacy"
+                    "name": "Росбанк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ავერსი (Aversi)",
-                "icon": "pharmacy",
+                "name": "Росбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/サンドラッグ": {
+            "amenity/bank/Banco Estado": {
                 "tags": {
                 "tags": {
-                    "name": "サンドラッグ",
-                    "amenity": "pharmacy"
+                    "name": "Banco Estado",
+                    "amenity": "bank"
                 },
                 },
-                "name": "サンドラッグ",
-                "icon": "pharmacy",
+                "name": "Banco Estado",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/スギ薬局": {
+            "amenity/bank/BCI": {
                 "tags": {
                 "tags": {
-                    "name": "スギ薬局",
-                    "amenity": "pharmacy"
+                    "name": "BCI",
+                    "amenity": "bank"
                 },
                 },
-                "name": "スギ薬局",
-                "icon": "pharmacy",
+                "name": "BCI",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/トモズ (Tomod's)": {
+            "amenity/bank/SunTrust": {
                 "tags": {
                 "tags": {
-                    "name": "トモズ (Tomod's)",
-                    "amenity": "pharmacy"
+                    "name": "SunTrust",
+                    "amenity": "bank"
                 },
                 },
-                "name": "トモズ (Tomod's)",
-                "icon": "pharmacy",
+                "name": "SunTrust",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/ドラッグてらしま (Drug Terashima)": {
+            "amenity/bank/PNC Bank": {
                 "tags": {
                 "tags": {
-                    "name": "ドラッグてらしま (Drug Terashima)",
-                    "amenity": "pharmacy"
+                    "name": "PNC Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "ドラッグてらしま (Drug Terashima)",
-                "icon": "pharmacy",
+                "name": "PNC Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/マツモトキヨシ": {
+            "amenity/bank/신한은행": {
                 "tags": {
                 "tags": {
-                    "name": "マツモトキヨシ",
-                    "amenity": "pharmacy"
+                    "name": "신한은행",
+                    "name:en": "Sinhan Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "マツモトキヨシ",
-                "icon": "pharmacy",
+                "name": "신한은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Cross Keys": {
+            "amenity/bank/우리은행": {
                 "tags": {
                 "tags": {
-                    "name": "Cross Keys",
-                    "amenity": "pub"
+                    "name": "우리은행",
+                    "name:en": "Uri Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Cross Keys",
-                "icon": "beer",
+                "name": "우리은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Irish Pub": {
+            "amenity/bank/국민은행": {
                 "tags": {
                 "tags": {
-                    "name": "Irish Pub",
-                    "amenity": "pub"
+                    "name": "국민은행",
+                    "name:en": "Gungmin Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Irish Pub",
-                "icon": "beer",
+                "name": "국민은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Kings Arms": {
+            "amenity/bank/중소기업은행": {
                 "tags": {
                 "tags": {
-                    "name": "Kings Arms",
-                    "amenity": "pub"
+                    "name": "중소기업은행",
+                    "name:en": "Industrial Bank of Korea",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Kings Arms",
-                "icon": "beer",
+                "name": "중소기업은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Kings Head": {
+            "amenity/bank/광주은행": {
                 "tags": {
                 "tags": {
-                    "name": "Kings Head",
-                    "amenity": "pub"
+                    "name": "광주은행",
+                    "name:en": "Gwangju Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Kings Head",
-                "icon": "beer",
+                "name": "광주은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/New Inn": {
+            "amenity/bank/Газпромбанк": {
                 "tags": {
                 "tags": {
-                    "name": "New Inn",
-                    "amenity": "pub"
+                    "name": "Газпромбанк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "New Inn",
-                "icon": "beer",
+                "name": "Газпромбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Prince of Wales": {
+            "amenity/bank/M&T Bank": {
                 "tags": {
                 "tags": {
-                    "name": "Prince of Wales",
-                    "amenity": "pub"
+                    "name": "M&T Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Prince of Wales",
-                "icon": "beer",
+                "name": "M&T Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Red Lion": {
+            "amenity/bank/Caja de Burgos": {
                 "tags": {
                 "tags": {
-                    "name": "Red Lion",
-                    "amenity": "pub"
+                    "name": "Caja de Burgos",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Red Lion",
-                "icon": "beer",
+                "name": "Caja de Burgos",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Rose & Crown": {
+            "amenity/bank/Santander Totta": {
                 "tags": {
                 "tags": {
-                    "name": "Rose & Crown",
-                    "amenity": "pub"
+                    "name": "Santander Totta",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Rose & Crown",
-                "icon": "beer",
+                "name": "Santander Totta",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Rose and Crown": {
+            "amenity/bank/УкрСиббанк": {
                 "tags": {
                 "tags": {
-                    "name": "Rose and Crown",
-                    "amenity": "pub"
+                    "name": "УкрСиббанк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Rose and Crown",
-                "icon": "beer",
+                "name": "УкрСиббанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Royal Hotel": {
+            "amenity/bank/Ощадбанк": {
                 "tags": {
                 "tags": {
-                    "name": "Royal Hotel",
-                    "amenity": "pub"
+                    "name": "Ощадбанк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Royal Hotel",
-                "icon": "beer",
+                "name": "Ощадбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/Royal Oak": {
+            "amenity/bank/Уралсиб": {
                 "tags": {
                 "tags": {
-                    "name": "Royal Oak",
-                    "amenity": "pub"
+                    "name": "Уралсиб",
+                    "amenity": "bank"
                 },
                 },
-                "name": "Royal Oak",
-                "icon": "beer",
+                "name": "Уралсиб",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Anchor": {
+            "amenity/bank/りそな銀行": {
                 "tags": {
                 "tags": {
-                    "name": "The Anchor",
-                    "amenity": "pub"
+                    "name": "りそな銀行",
+                    "name:en": "Mizuho Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Anchor",
-                "icon": "beer",
+                "name": "りそな銀行",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Angel": {
+            "amenity/bank/Cajero Automatico Bancared": {
                 "tags": {
                 "tags": {
-                    "name": "The Angel",
-                    "amenity": "pub"
+                    "name": "Cajero Automatico Bancared",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Angel",
-                "icon": "beer",
+                "name": "Cajero Automatico Bancared",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Bell": {
+            "amenity/bank/Промсвязьбанк": {
                 "tags": {
                 "tags": {
-                    "name": "The Bell",
-                    "amenity": "pub"
+                    "name": "Промсвязьбанк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Bell",
-                "icon": "beer",
+                "name": "Промсвязьбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Black Horse": {
+            "amenity/bank/三井住友銀行": {
                 "tags": {
                 "tags": {
-                    "name": "The Black Horse",
-                    "amenity": "pub"
+                    "name": "三井住友銀行",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Black Horse",
-                "icon": "beer",
+                "name": "三井住友銀行",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Bull": {
+            "amenity/bank/Banco Provincia": {
                 "tags": {
                 "tags": {
-                    "name": "The Bull",
-                    "amenity": "pub"
+                    "name": "Banco Provincia",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Bull",
-                "icon": "beer",
+                "name": "Banco Provincia",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Castle": {
+            "amenity/bank/BB&T": {
                 "tags": {
                 "tags": {
-                    "name": "The Castle",
-                    "amenity": "pub"
+                    "name": "BB&T",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Castle",
-                "icon": "beer",
+                "name": "BB&T",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Chequers": {
+            "amenity/bank/Возрождение": {
                 "tags": {
                 "tags": {
-                    "name": "The Chequers",
-                    "amenity": "pub"
+                    "name": "Возрождение",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Chequers",
-                "icon": "beer",
+                "name": "Возрождение",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Cross Keys": {
+            "amenity/bank/Capital One": {
                 "tags": {
                 "tags": {
-                    "name": "The Cross Keys",
-                    "amenity": "pub"
+                    "name": "Capital One",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Cross Keys",
-                "icon": "beer",
+                "name": "Capital One",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Crown": {
+            "amenity/bank/Bank Mandiri": {
                 "tags": {
                 "tags": {
-                    "name": "The Crown",
-                    "amenity": "pub"
+                    "name": "Bank Mandiri",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Crown",
-                "icon": "beer",
+                "name": "Bank Mandiri",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Crown Inn": {
+            "amenity/bank/Banco de la Nación": {
                 "tags": {
                 "tags": {
-                    "name": "The Crown Inn",
-                    "amenity": "pub"
+                    "name": "Banco de la Nación",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Crown Inn",
-                "icon": "beer",
+                "name": "Banco de la Nación",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Fox": {
+            "amenity/bank/Banco G&T Continental": {
                 "tags": {
                 "tags": {
-                    "name": "The Fox",
-                    "amenity": "pub"
+                    "name": "Banco G&T Continental",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Fox",
-                "icon": "beer",
+                "name": "Banco G&T Continental",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The George": {
+            "amenity/bank/Peoples Bank": {
                 "tags": {
                 "tags": {
-                    "name": "The George",
-                    "amenity": "pub"
+                    "name": "Peoples Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The George",
-                "icon": "beer",
+                "name": "Peoples Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Green Man": {
+            "amenity/bank/Совкомбанк": {
                 "tags": {
                 "tags": {
-                    "name": "The Green Man",
-                    "amenity": "pub"
+                    "name": "Совкомбанк",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Green Man",
-                "icon": "beer",
+                "name": "Совкомбанк",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Greyhound": {
+            "amenity/bank/Provincial": {
                 "tags": {
                 "tags": {
-                    "name": "The Greyhound",
-                    "amenity": "pub"
+                    "name": "Provincial",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Greyhound",
-                "icon": "beer",
+                "name": "Provincial",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Kings Arms": {
+            "amenity/bank/Banco de Desarrollo Banrural": {
                 "tags": {
                 "tags": {
-                    "name": "The Kings Arms",
-                    "amenity": "pub"
+                    "name": "Banco de Desarrollo Banrural",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Kings Arms",
-                "icon": "beer",
+                "name": "Banco de Desarrollo Banrural",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Kings Head": {
+            "amenity/bank/Banco Bradesco": {
                 "tags": {
                 "tags": {
-                    "name": "The Kings Head",
-                    "amenity": "pub"
+                    "name": "Banco Bradesco",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Kings Head",
-                "icon": "beer",
+                "name": "Banco Bradesco",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The New Inn": {
+            "amenity/bank/Bicentenario": {
                 "tags": {
                 "tags": {
-                    "name": "The New Inn",
-                    "amenity": "pub"
+                    "name": "Bicentenario",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The New Inn",
-                "icon": "beer",
+                "name": "Bicentenario",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Plough": {
+            "amenity/bank/ლიბერთი ბანკი": {
                 "tags": {
                 "tags": {
-                    "name": "The Plough",
-                    "amenity": "pub"
+                    "name": "ლიბერთი ბანკი",
+                    "name:en": "Liberty Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Plough",
-                "icon": "beer",
+                "name": "ლიბერთი ბანკი",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Prince of Wales": {
+            "amenity/bank/Banesco": {
                 "tags": {
                 "tags": {
-                    "name": "The Prince of Wales",
-                    "amenity": "pub"
+                    "name": "Banesco",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Prince of Wales",
-                "icon": "beer",
+                "name": "Banesco",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Queens Head": {
+            "amenity/bank/Mercantil": {
                 "tags": {
                 "tags": {
-                    "name": "The Queens Head",
-                    "amenity": "pub"
+                    "name": "Mercantil",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Queens Head",
-                "icon": "beer",
+                "name": "Mercantil",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Railway": {
+            "amenity/bank/Del Tesoro": {
                 "tags": {
                 "tags": {
-                    "name": "The Railway",
-                    "amenity": "pub"
+                    "name": "Del Tesoro",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Railway",
-                "icon": "beer",
+                "name": "Del Tesoro",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Red Lion": {
+            "amenity/bank/하나은행": {
                 "tags": {
                 "tags": {
-                    "name": "The Red Lion",
-                    "amenity": "pub"
+                    "name": "하나은행",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Red Lion",
-                "icon": "beer",
+                "name": "하나은행",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Rising Sun": {
+            "amenity/bank/CityCommerce Bank": {
                 "tags": {
                 "tags": {
-                    "name": "The Rising Sun",
-                    "amenity": "pub"
+                    "name": "CityCommerce Bank",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Rising Sun",
-                "icon": "beer",
+                "name": "CityCommerce Bank",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Royal Oak": {
+            "amenity/bank/De Venezuela": {
                 "tags": {
                 "tags": {
-                    "name": "The Royal Oak",
-                    "amenity": "pub"
+                    "name": "De Venezuela",
+                    "amenity": "bank"
                 },
                 },
-                "name": "The Royal Oak",
-                "icon": "beer",
+                "name": "De Venezuela",
+                "icon": "bank",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "atm",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Ship": {
+            "amenity/car_rental/Europcar": {
                 "tags": {
                 "tags": {
-                    "name": "The Ship",
-                    "amenity": "pub"
+                    "name": "Europcar",
+                    "amenity": "car_rental"
                 },
                 },
-                "name": "The Ship",
-                "icon": "beer",
+                "name": "Europcar",
+                "icon": "car",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Ship Inn": {
+            "amenity/car_rental/Budget": {
                 "tags": {
                 "tags": {
-                    "name": "The Ship Inn",
-                    "amenity": "pub"
+                    "name": "Budget",
+                    "amenity": "car_rental"
                 },
                 },
-                "name": "The Ship Inn",
-                "icon": "beer",
+                "name": "Budget",
+                "icon": "car",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Star": {
+            "amenity/car_rental/Sixt": {
                 "tags": {
                 "tags": {
-                    "name": "The Star",
-                    "amenity": "pub"
+                    "name": "Sixt",
+                    "amenity": "car_rental"
                 },
                 },
-                "name": "The Star",
-                "icon": "beer",
+                "name": "Sixt",
+                "icon": "car",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Swan": {
+            "amenity/car_rental/Avis": {
                 "tags": {
                 "tags": {
-                    "name": "The Swan",
-                    "amenity": "pub"
+                    "name": "Avis",
+                    "amenity": "car_rental"
                 },
                 },
-                "name": "The Swan",
-                "icon": "beer",
+                "name": "Avis",
+                "icon": "car",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Victoria": {
+            "amenity/car_rental/Hertz": {
                 "tags": {
                 "tags": {
-                    "name": "The Victoria",
-                    "amenity": "pub"
+                    "name": "Hertz",
+                    "amenity": "car_rental"
                 },
                 },
-                "name": "The Victoria",
-                "icon": "beer",
+                "name": "Hertz",
+                "icon": "car",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The Wheatsheaf": {
+            "amenity/car_rental/Enterprise": {
                 "tags": {
                 "tags": {
-                    "name": "The Wheatsheaf",
-                    "amenity": "pub"
+                    "name": "Enterprise",
+                    "amenity": "car_rental"
                 },
                 },
-                "name": "The Wheatsheaf",
-                "icon": "beer",
+                "name": "Enterprise",
+                "icon": "car",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The White Hart": {
+            "amenity/car_rental/stadtmobil CarSharing-Station": {
                 "tags": {
                 "tags": {
-                    "name": "The White Hart",
-                    "amenity": "pub"
+                    "name": "stadtmobil CarSharing-Station",
+                    "amenity": "car_rental"
                 },
                 },
-                "name": "The White Hart",
-                "icon": "beer",
+                "name": "stadtmobil CarSharing-Station",
+                "icon": "car",
                 "geometry": [
                     "point",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "area"
                 ],
                 "fields": [
-                    "building_area",
-                    "address"
+                    "operator"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The White Horse": {
+            "amenity/pharmacy/Rowlands Pharmacy": {
                 "tags": {
                 "tags": {
-                    "name": "The White Horse",
-                    "amenity": "pub"
+                    "name": "Rowlands Pharmacy",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "The White Horse",
-                "icon": "beer",
+                "name": "Rowlands Pharmacy",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/pub/The White Lion": {
+            "amenity/pharmacy/Boots": {
                 "tags": {
                 "tags": {
-                    "name": "The White Lion",
-                    "amenity": "pub"
+                    "name": "Boots",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "The White Lion",
-                "icon": "beer",
+                "name": "Boots",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Altglas": {
+            "amenity/pharmacy/Marien-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Altglas",
-                    "amenity": "recycling"
+                    "name": "Marien-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Altglas",
-                "icon": "recycling",
+                "name": "Marien-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Déchèterie": {
+            "amenity/pharmacy/Mercury Drug": {
                 "tags": {
                 "tags": {
-                    "name": "Déchèterie",
-                    "amenity": "recycling"
+                    "name": "Mercury Drug",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Déchèterie",
-                "icon": "recycling",
+                "name": "Mercury Drug",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Glas": {
+            "amenity/pharmacy/Löwen-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Glas",
-                    "amenity": "recycling"
+                    "name": "Löwen-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Glas",
-                "icon": "recycling",
+                "name": "Löwen-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Glascontainer": {
+            "amenity/pharmacy/Superdrug": {
                 "tags": {
                 "tags": {
-                    "name": "Glascontainer",
-                    "amenity": "recycling"
+                    "name": "Superdrug",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Glascontainer",
-                "icon": "recycling",
+                "name": "Superdrug",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Recyclinghof": {
+            "amenity/pharmacy/Sonnen-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Recyclinghof",
-                    "amenity": "recycling"
+                    "name": "Sonnen-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Recyclinghof",
-                "icon": "recycling",
+                "name": "Sonnen-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/recycling/Wertstoffhof": {
+            "amenity/pharmacy/Rathaus-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Wertstoffhof",
-                    "amenity": "recycling"
+                    "name": "Rathaus-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Wertstoffhof",
-                "icon": "recycling",
+                "name": "Rathaus-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cans",
-                    "glass",
-                    "paper",
-                    "clothes"
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Adler": {
+            "amenity/pharmacy/Engel-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Adler",
-                    "amenity": "restaurant"
+                    "name": "Engel-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Adler",
-                "icon": "restaurant",
+                "name": "Engel-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Akropolis": {
+            "amenity/pharmacy/Hirsch-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Akropolis",
-                    "amenity": "restaurant"
+                    "name": "Hirsch-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Akropolis",
-                "icon": "restaurant",
+                "name": "Hirsch-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Alte Post": {
+            "amenity/pharmacy/Stern-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Alte Post",
-                    "amenity": "restaurant"
+                    "name": "Stern-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Alte Post",
-                "icon": "restaurant",
+                "name": "Stern-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Applebee's": {
+            "amenity/pharmacy/Lloyds Pharmacy": {
                 "tags": {
                 "tags": {
-                    "name": "Applebee's",
-                    "amenity": "restaurant"
+                    "name": "Lloyds Pharmacy",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Applebee's",
-                "icon": "restaurant",
+                "name": "Lloyds Pharmacy",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Athen": {
+            "amenity/pharmacy/Rosen-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Athen",
-                    "amenity": "restaurant"
+                    "name": "Rosen-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Athen",
-                "icon": "restaurant",
+                "name": "Rosen-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Bella Italia": {
+            "amenity/pharmacy/Stadt-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Bella Italia",
-                    "amenity": "restaurant"
+                    "name": "Stadt-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Bella Italia",
-                "icon": "restaurant",
+                "name": "Stadt-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Bob Evans": {
+            "amenity/pharmacy/Markt-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Bob Evans",
-                    "amenity": "restaurant"
+                    "name": "Markt-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Bob Evans",
-                "icon": "restaurant",
+                "name": "Markt-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Boston Pizza": {
+            "amenity/pharmacy/Аптека": {
                 "tags": {
                 "tags": {
-                    "name": "Boston Pizza",
-                    "amenity": "restaurant"
+                    "name": "Аптека",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Boston Pizza",
-                "icon": "restaurant",
+                "name": "Аптека",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Buffalo Grill": {
+            "amenity/pharmacy/Pharmasave": {
                 "tags": {
                 "tags": {
-                    "name": "Buffalo Grill",
-                    "amenity": "restaurant"
+                    "name": "Pharmasave",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Buffalo Grill",
-                "icon": "restaurant",
+                "name": "Pharmasave",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Buffalo Wild Wings": {
+            "amenity/pharmacy/Brunnen-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Buffalo Wild Wings",
-                    "amenity": "restaurant"
+                    "name": "Brunnen-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Buffalo Wild Wings",
-                "icon": "restaurant",
+                "name": "Brunnen-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Bären": {
+            "amenity/pharmacy/Shoppers Drug Mart": {
                 "tags": {
                 "tags": {
-                    "name": "Bären",
-                    "amenity": "restaurant"
+                    "name": "Shoppers Drug Mart",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Bären",
-                "icon": "restaurant",
+                "name": "Shoppers Drug Mart",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/California Pizza Kitchen": {
+            "amenity/pharmacy/Apotheke am Markt": {
                 "tags": {
                 "tags": {
-                    "name": "California Pizza Kitchen",
-                    "amenity": "restaurant"
+                    "name": "Apotheke am Markt",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "California Pizza Kitchen",
-                "icon": "restaurant",
+                "name": "Apotheke am Markt",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Chili's": {
+            "amenity/pharmacy/Alte Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Chili's",
-                    "amenity": "restaurant"
+                    "name": "Alte Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Chili's",
-                "icon": "restaurant",
+                "name": "Alte Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/China Garden": {
+            "amenity/pharmacy/Neue Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "China Garden",
-                    "amenity": "restaurant"
+                    "name": "Neue Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "China Garden",
-                "icon": "restaurant",
+                "name": "Neue Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/China Town": {
+            "amenity/pharmacy/Gintarinė vaistinė": {
                 "tags": {
                 "tags": {
-                    "name": "China Town",
-                    "amenity": "restaurant"
+                    "name": "Gintarinė vaistinė",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "China Town",
-                "icon": "restaurant",
+                "name": "Gintarinė vaistinė",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Courtepaille": {
+            "amenity/pharmacy/Rats-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Courtepaille",
-                    "amenity": "restaurant"
+                    "name": "Rats-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Courtepaille",
-                "icon": "restaurant",
+                "name": "Rats-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Cracker Barrel": {
+            "amenity/pharmacy/Adler Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Cracker Barrel",
-                    "amenity": "restaurant"
+                    "name": "Adler Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Cracker Barrel",
-                "icon": "restaurant",
+                "name": "Adler Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Da Vinci": {
+            "amenity/pharmacy/Pharmacie Centrale": {
                 "tags": {
                 "tags": {
-                    "name": "Da Vinci",
-                    "amenity": "restaurant"
+                    "name": "Pharmacie Centrale",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Da Vinci",
-                "icon": "restaurant",
+                "name": "Pharmacie Centrale",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Delphi": {
+            "amenity/pharmacy/Walgreens": {
                 "tags": {
                 "tags": {
-                    "name": "Delphi",
-                    "amenity": "restaurant"
+                    "name": "Walgreens",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Delphi",
-                "icon": "restaurant",
+                "name": "Walgreens",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Denny's": {
+            "amenity/pharmacy/Rite Aid": {
                 "tags": {
                 "tags": {
-                    "name": "Denny's",
-                    "amenity": "restaurant"
+                    "name": "Rite Aid",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Denny's",
-                "icon": "restaurant",
+                "name": "Rite Aid",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Deutsches Haus": {
+            "amenity/pharmacy/Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Deutsches Haus",
-                    "amenity": "restaurant"
+                    "name": "Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Deutsches Haus",
-                "icon": "restaurant",
+                "name": "Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Dionysos": {
+            "amenity/pharmacy/Linden-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Dionysos",
-                    "amenity": "restaurant"
+                    "name": "Linden-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Dionysos",
-                "icon": "restaurant",
+                "name": "Linden-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Dolce Vita": {
+            "amenity/pharmacy/Bahnhof-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Dolce Vita",
-                    "amenity": "restaurant"
+                    "name": "Bahnhof-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Dolce Vita",
-                "icon": "restaurant",
+                "name": "Bahnhof-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/El Greco": {
+            "amenity/pharmacy/Burg-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "El Greco",
-                    "amenity": "restaurant"
+                    "name": "Burg-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "El Greco",
-                "icon": "restaurant",
+                "name": "Burg-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Flunch": {
+            "amenity/pharmacy/Jean Coutu": {
                 "tags": {
                 "tags": {
-                    "name": "Flunch",
-                    "amenity": "restaurant"
+                    "name": "Jean Coutu",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Flunch",
-                "icon": "restaurant",
+                "name": "Jean Coutu",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Frankie & Benny's": {
+            "amenity/pharmacy/Pharmaprix": {
                 "tags": {
                 "tags": {
-                    "name": "Frankie & Benny's",
-                    "amenity": "restaurant"
+                    "name": "Pharmaprix",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Frankie & Benny's",
-                "icon": "restaurant",
+                "name": "Pharmaprix",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Friendly's": {
+            "amenity/pharmacy/Farmacias Ahumada": {
                 "tags": {
                 "tags": {
-                    "name": "Friendly's",
-                    "amenity": "restaurant"
+                    "name": "Farmacias Ahumada",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Friendly's",
-                "icon": "restaurant",
+                "name": "Farmacias Ahumada",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Gasthaus Adler": {
+            "amenity/pharmacy/Farmacia Comunale": {
                 "tags": {
                 "tags": {
-                    "name": "Gasthaus Adler",
-                    "amenity": "restaurant"
+                    "name": "Farmacia Comunale",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Gasthaus Adler",
-                "icon": "restaurant",
+                "name": "Farmacia Comunale",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Gasthaus Krone": {
+            "amenity/pharmacy/Farmacias Cruz Verde": {
                 "tags": {
                 "tags": {
-                    "name": "Gasthaus Krone",
-                    "amenity": "restaurant"
+                    "name": "Farmacias Cruz Verde",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Gasthaus Krone",
-                "icon": "restaurant",
+                "name": "Farmacias Cruz Verde",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Gasthof zur Post": {
+            "amenity/pharmacy/Cruz Verde": {
                 "tags": {
                 "tags": {
-                    "name": "Gasthof zur Post",
-                    "amenity": "restaurant"
+                    "name": "Cruz Verde",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Gasthof zur Post",
-                "icon": "restaurant",
+                "name": "Cruz Verde",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Golden Corral": {
+            "amenity/pharmacy/Hubertus Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Golden Corral",
-                    "amenity": "restaurant"
+                    "name": "Hubertus Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Golden Corral",
-                "icon": "restaurant",
+                "name": "Hubertus Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Grüner Baum": {
+            "amenity/pharmacy/CVS": {
                 "tags": {
                 "tags": {
-                    "name": "Grüner Baum",
-                    "amenity": "restaurant"
+                    "name": "CVS",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Grüner Baum",
-                "icon": "restaurant",
+                "name": "CVS",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hard Rock Cafe": {
+            "amenity/pharmacy/Farmacias SalcoBrand": {
                 "tags": {
                 "tags": {
-                    "name": "Hard Rock Cafe",
-                    "amenity": "restaurant"
+                    "name": "Farmacias SalcoBrand",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Hard Rock Cafe",
-                "icon": "restaurant",
+                "name": "Farmacias SalcoBrand",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hellas": {
+            "amenity/pharmacy/Фармация": {
                 "tags": {
                 "tags": {
-                    "name": "Hellas",
-                    "amenity": "restaurant"
+                    "name": "Фармация",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Hellas",
-                "icon": "restaurant",
+                "name": "Фармация",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hippopotamus": {
+            "amenity/pharmacy/Bären-Apotheke": {
                 "tags": {
                 "tags": {
-                    "name": "Hippopotamus",
-                    "amenity": "restaurant"
+                    "name": "Bären-Apotheke",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Hippopotamus",
-                "icon": "restaurant",
+                "name": "Bären-Apotheke",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hirsch": {
+            "amenity/pharmacy/Clicks": {
                 "tags": {
                 "tags": {
-                    "name": "Hirsch",
-                    "amenity": "restaurant"
+                    "name": "Clicks",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Hirsch",
-                "icon": "restaurant",
+                "name": "Clicks",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hirschen": {
+            "amenity/pharmacy/セイジョー": {
                 "tags": {
                 "tags": {
-                    "name": "Hirschen",
-                    "amenity": "restaurant"
+                    "name": "セイジョー",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Hirschen",
-                "icon": "restaurant",
+                "name": "セイジョー",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hong Kong": {
+            "amenity/pharmacy/マツモトキヨシ": {
                 "tags": {
                 "tags": {
-                    "name": "Hong Kong",
-                    "amenity": "restaurant"
+                    "name": "マツモトキヨシ",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Hong Kong",
-                "icon": "restaurant",
+                "name": "マツモトキヨシ",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Hooters": {
+            "amenity/pharmacy/Вита": {
                 "tags": {
                 "tags": {
-                    "name": "Hooters",
-                    "amenity": "restaurant"
+                    "name": "Вита",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Hooters",
-                "icon": "restaurant",
+                "name": "Вита",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/IHOP": {
+            "amenity/pharmacy/Радуга": {
                 "tags": {
                 "tags": {
-                    "name": "IHOP",
-                    "amenity": "restaurant"
+                    "name": "Радуга",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "IHOP",
-                "icon": "restaurant",
+                "name": "Радуга",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Kantine": {
+            "amenity/pharmacy/サンドラッグ": {
                 "tags": {
                 "tags": {
-                    "name": "Kantine",
-                    "amenity": "restaurant"
+                    "name": "サンドラッグ",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Kantine",
-                "icon": "restaurant",
+                "name": "サンドラッグ",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Kelsey's": {
+            "amenity/pharmacy/Apteka": {
                 "tags": {
                 "tags": {
-                    "name": "Kelsey's",
-                    "amenity": "restaurant"
+                    "name": "Apteka",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Kelsey's",
-                "icon": "restaurant",
+                "name": "Apteka",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Kirchenwirt": {
+            "amenity/pharmacy/Первая помощь": {
                 "tags": {
                 "tags": {
-                    "name": "Kirchenwirt",
-                    "amenity": "restaurant"
+                    "name": "Первая помощь",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Kirchenwirt",
-                "icon": "restaurant",
+                "name": "Первая помощь",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Kreuz": {
+            "amenity/pharmacy/Ригла": {
                 "tags": {
                 "tags": {
-                    "name": "Kreuz",
-                    "amenity": "restaurant"
+                    "name": "Ригла",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Kreuz",
-                "icon": "restaurant",
+                "name": "Ригла",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Krone": {
+            "amenity/pharmacy/Имплозия": {
                 "tags": {
                 "tags": {
-                    "name": "Krone",
-                    "amenity": "restaurant"
+                    "name": "Имплозия",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Krone",
-                "icon": "restaurant",
+                "name": "Имплозия",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/La Cantina": {
+            "amenity/pharmacy/Kinney Drugs": {
                 "tags": {
                 "tags": {
-                    "name": "La Cantina",
-                    "amenity": "restaurant"
+                    "name": "Kinney Drugs",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "La Cantina",
-                "icon": "restaurant",
+                "name": "Kinney Drugs",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/La Dolce Vita": {
+            "amenity/pharmacy/Классика": {
                 "tags": {
                 "tags": {
-                    "name": "La Dolce Vita",
-                    "amenity": "restaurant"
+                    "name": "Классика",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "La Dolce Vita",
-                "icon": "restaurant",
+                "name": "Классика",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/La Perla": {
+            "amenity/pharmacy/Ljekarna": {
                 "tags": {
                 "tags": {
-                    "name": "La Perla",
-                    "amenity": "restaurant"
+                    "name": "Ljekarna",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "La Perla",
-                "icon": "restaurant",
+                "name": "Ljekarna",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/La Piazza": {
+            "amenity/pharmacy/SalcoBrand": {
                 "tags": {
                 "tags": {
-                    "name": "La Piazza",
-                    "amenity": "restaurant"
+                    "name": "SalcoBrand",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "La Piazza",
-                "icon": "restaurant",
+                "name": "SalcoBrand",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Lamm": {
+            "amenity/pharmacy/Аптека 36,6": {
                 "tags": {
                 "tags": {
-                    "name": "Lamm",
-                    "amenity": "restaurant"
+                    "name": "Аптека 36,6",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Lamm",
-                "icon": "restaurant",
+                "name": "Аптека 36,6",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Linde": {
+            "amenity/pharmacy/Фармакор": {
                 "tags": {
                 "tags": {
-                    "name": "Linde",
-                    "amenity": "restaurant"
+                    "name": "Фармакор",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Linde",
-                "icon": "restaurant",
+                "name": "Фармакор",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Lindenhof": {
+            "amenity/pharmacy/スギ薬局": {
                 "tags": {
                 "tags": {
-                    "name": "Lindenhof",
-                    "amenity": "restaurant"
+                    "name": "スギ薬局",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Lindenhof",
-                "icon": "restaurant",
+                "name": "スギ薬局",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Little Chef": {
+            "amenity/pharmacy/Аптечный пункт": {
                 "tags": {
                 "tags": {
-                    "name": "Little Chef",
-                    "amenity": "restaurant"
+                    "name": "Аптечный пункт",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Little Chef",
-                "icon": "restaurant",
+                "name": "Аптечный пункт",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Longhorn Steakhouse": {
+            "amenity/pharmacy/Невис": {
                 "tags": {
                 "tags": {
-                    "name": "Longhorn Steakhouse",
-                    "amenity": "restaurant"
+                    "name": "Невис",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Longhorn Steakhouse",
-                "icon": "restaurant",
+                "name": "Невис",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Lotus": {
+            "amenity/pharmacy/トモズ (Tomod's)": {
                 "tags": {
                 "tags": {
-                    "name": "Lotus",
-                    "amenity": "restaurant"
+                    "name": "トモズ (Tomod's)",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Lotus",
-                "icon": "restaurant",
+                "name": "トモズ (Tomod's)",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Löwen": {
+            "amenity/pharmacy/Eurovaistinė": {
                 "tags": {
                 "tags": {
-                    "name": "Löwen",
-                    "amenity": "restaurant"
+                    "name": "Eurovaistinė",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Löwen",
-                "icon": "restaurant",
+                "name": "Eurovaistinė",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Mamma Mia": {
+            "amenity/pharmacy/Farmacity": {
                 "tags": {
                 "tags": {
-                    "name": "Mamma Mia",
-                    "amenity": "restaurant"
+                    "name": "Farmacity",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Mamma Mia",
-                "icon": "restaurant",
+                "name": "Farmacity",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Mandarin": {
+            "amenity/pharmacy/аптека": {
                 "tags": {
                 "tags": {
-                    "name": "Mandarin",
-                    "amenity": "restaurant"
+                    "name": "аптека",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Mandarin",
-                "icon": "restaurant",
+                "name": "аптека",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Mang Inasal": {
+            "amenity/pharmacy/The Generics Pharmacy": {
                 "tags": {
                 "tags": {
-                    "name": "Mang Inasal",
-                    "amenity": "restaurant"
+                    "name": "The Generics Pharmacy",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Mang Inasal",
-                "icon": "restaurant",
+                "name": "The Generics Pharmacy",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Mensa": {
+            "amenity/pharmacy/Farmatodo": {
                 "tags": {
                 "tags": {
-                    "name": "Mensa",
-                    "amenity": "restaurant"
+                    "name": "Farmatodo",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Mensa",
-                "icon": "restaurant",
+                "name": "Farmatodo",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Milano": {
+            "amenity/pharmacy/Фармленд": {
                 "tags": {
                 "tags": {
-                    "name": "Milano",
-                    "amenity": "restaurant"
+                    "name": "Фармленд",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Milano",
-                "icon": "restaurant",
+                "name": "Фармленд",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Mykonos": {
+            "amenity/pharmacy/ドラッグてらしま (Drug Terashima)": {
                 "tags": {
                 "tags": {
-                    "name": "Mykonos",
-                    "amenity": "restaurant"
+                    "name": "ドラッグてらしま (Drug Terashima)",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Mykonos",
-                "icon": "restaurant",
+                "name": "ドラッグてらしま (Drug Terashima)",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Nando's": {
+            "amenity/pharmacy/ავერსი (Aversi)": {
                 "tags": {
                 "tags": {
-                    "name": "Nando's",
-                    "amenity": "restaurant"
+                    "name": "ავერსი (Aversi)",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Nando's",
-                "icon": "restaurant",
+                "name": "ავერსი (Aversi)",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Ochsen": {
+            "amenity/pharmacy/Farmahorro": {
                 "tags": {
                 "tags": {
-                    "name": "Ochsen",
-                    "amenity": "restaurant"
+                    "name": "Farmahorro",
+                    "amenity": "pharmacy"
                 },
                 },
-                "name": "Ochsen",
-                "icon": "restaurant",
+                "name": "Farmahorro",
+                "icon": "pharmacy",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Olive Garden": {
+            "amenity/cafe/Starbucks": {
                 "tags": {
                 "tags": {
-                    "name": "Olive Garden",
-                    "amenity": "restaurant"
+                    "name": "Starbucks",
+                    "cuisine": "coffee_shop",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Olive Garden",
-                "icon": "restaurant",
+                "name": "Starbucks",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80927,19 +84819,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Olympia": {
+            "amenity/cafe/Cafeteria": {
                 "tags": {
                 "tags": {
-                    "name": "Olympia",
-                    "amenity": "restaurant"
+                    "name": "Cafeteria",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Olympia",
-                "icon": "restaurant",
+                "name": "Cafeteria",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80947,19 +84840,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Outback Steakhouse": {
+            "amenity/cafe/Costa": {
                 "tags": {
                 "tags": {
-                    "name": "Outback Steakhouse",
-                    "amenity": "restaurant"
+                    "name": "Costa",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Outback Steakhouse",
-                "icon": "restaurant",
+                "name": "Costa",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80967,19 +84861,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Panera Bread": {
+            "amenity/cafe/Caffè Nero": {
                 "tags": {
                 "tags": {
-                    "name": "Panera Bread",
-                    "amenity": "restaurant"
+                    "name": "Caffè Nero",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Panera Bread",
-                "icon": "restaurant",
+                "name": "Caffè Nero",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -80987,19 +84882,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Panorama": {
+            "amenity/cafe/Кафе": {
                 "tags": {
                 "tags": {
-                    "name": "Panorama",
-                    "amenity": "restaurant"
+                    "name": "Кафе",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Panorama",
-                "icon": "restaurant",
+                "name": "Кафе",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81007,19 +84903,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Peking": {
+            "amenity/cafe/Café Central": {
                 "tags": {
                 "tags": {
-                    "name": "Peking",
-                    "amenity": "restaurant"
+                    "name": "Café Central",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Peking",
-                "icon": "restaurant",
+                "name": "Café Central",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81027,19 +84924,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Perkins": {
+            "amenity/cafe/Second Cup": {
                 "tags": {
                 "tags": {
-                    "name": "Perkins",
-                    "amenity": "restaurant"
+                    "name": "Second Cup",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Perkins",
-                "icon": "restaurant",
+                "name": "Second Cup",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81047,19 +84945,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Pizza Express": {
+            "amenity/cafe/Eisdiele": {
                 "tags": {
                 "tags": {
-                    "name": "Pizza Express",
-                    "amenity": "restaurant"
+                    "name": "Eisdiele",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Pizza Express",
-                "icon": "restaurant",
+                "name": "Eisdiele",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81067,19 +84966,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Pizza Hut": {
+            "amenity/cafe/Dunkin Donuts": {
                 "tags": {
                 "tags": {
-                    "name": "Pizza Hut",
-                    "amenity": "restaurant"
+                    "name": "Dunkin Donuts",
+                    "cuisine": "donut",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Pizza Hut",
-                "icon": "restaurant",
+                "name": "Dunkin Donuts",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81087,19 +84988,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Poseidon": {
+            "amenity/cafe/Segafredo": {
                 "tags": {
                 "tags": {
-                    "name": "Poseidon",
-                    "amenity": "restaurant"
+                    "name": "Segafredo",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Poseidon",
-                "icon": "restaurant",
+                "name": "Segafredo",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81107,19 +85009,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Prezzo": {
+            "amenity/cafe/Coffee Time": {
                 "tags": {
                 "tags": {
-                    "name": "Prezzo",
-                    "amenity": "restaurant"
+                    "name": "Coffee Time",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Prezzo",
-                "icon": "restaurant",
+                "name": "Coffee Time",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81127,19 +85030,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Ratskeller": {
+            "amenity/cafe/Cafe Coffee Day": {
                 "tags": {
                 "tags": {
-                    "name": "Ratskeller",
-                    "amenity": "restaurant"
+                    "name": "Cafe Coffee Day",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Ratskeller",
-                "icon": "restaurant",
+                "name": "Cafe Coffee Day",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81147,19 +85051,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Red Lobster": {
+            "amenity/cafe/Eiscafe Venezia": {
                 "tags": {
                 "tags": {
-                    "name": "Red Lobster",
-                    "amenity": "restaurant"
+                    "name": "Eiscafe Venezia",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Red Lobster",
-                "icon": "restaurant",
+                "name": "Eiscafe Venezia",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81167,19 +85072,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Red Robin": {
+            "amenity/cafe/スターバックス": {
                 "tags": {
                 "tags": {
-                    "name": "Red Robin",
-                    "amenity": "restaurant"
+                    "name": "スターバックス",
+                    "name:en": "Starbucks",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Red Robin",
-                "icon": "restaurant",
+                "name": "スターバックス",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81187,19 +85094,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Rhodos": {
+            "amenity/cafe/Шоколадница": {
                 "tags": {
                 "tags": {
-                    "name": "Rhodos",
-                    "amenity": "restaurant"
+                    "name": "Шоколадница",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Rhodos",
-                "icon": "restaurant",
+                "name": "Шоколадница",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81207,19 +85115,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Roma": {
+            "amenity/cafe/Pret A Manger": {
                 "tags": {
                 "tags": {
-                    "name": "Roma",
-                    "amenity": "restaurant"
+                    "name": "Pret A Manger",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Roma",
-                "icon": "restaurant",
+                "name": "Pret A Manger",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81227,19 +85136,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Ruby Tuesday": {
+            "amenity/cafe/Столовая": {
                 "tags": {
                 "tags": {
-                    "name": "Ruby Tuesday",
-                    "amenity": "restaurant"
+                    "name": "Столовая",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Ruby Tuesday",
-                "icon": "restaurant",
+                "name": "Столовая",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81247,19 +85157,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Rössli": {
+            "amenity/cafe/ドトール": {
                 "tags": {
                 "tags": {
-                    "name": "Rössli",
-                    "amenity": "restaurant"
+                    "name": "ドトール",
+                    "name:en": "DOUTOR",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Rössli",
-                "icon": "restaurant",
+                "name": "ドトール",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81267,19 +85179,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Sakura": {
+            "amenity/cafe/Tchibo": {
                 "tags": {
                 "tags": {
-                    "name": "Sakura",
-                    "amenity": "restaurant"
+                    "name": "Tchibo",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Sakura",
-                "icon": "restaurant",
+                "name": "Tchibo",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81287,19 +85200,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/San Marco": {
+            "amenity/cafe/Кофе Хауз": {
                 "tags": {
                 "tags": {
-                    "name": "San Marco",
-                    "amenity": "restaurant"
+                    "name": "Кофе Хауз",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "San Marco",
-                "icon": "restaurant",
+                "name": "Кофе Хауз",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81307,19 +85221,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Schwarzer Adler": {
+            "amenity/cafe/Caribou Coffee": {
                 "tags": {
                 "tags": {
-                    "name": "Schwarzer Adler",
-                    "amenity": "restaurant"
+                    "name": "Caribou Coffee",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Schwarzer Adler",
-                "icon": "restaurant",
+                "name": "Caribou Coffee",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81327,19 +85242,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Schützenhaus": {
+            "amenity/cafe/Уют": {
                 "tags": {
                 "tags": {
-                    "name": "Schützenhaus",
-                    "amenity": "restaurant"
+                    "name": "Уют",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Schützenhaus",
-                "icon": "restaurant",
+                "name": "Уют",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81347,19 +85263,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Seeblick": {
+            "amenity/cafe/Шашлычная": {
                 "tags": {
                 "tags": {
-                    "name": "Seeblick",
-                    "amenity": "restaurant"
+                    "name": "Шашлычная",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Seeblick",
-                "icon": "restaurant",
+                "name": "Шашлычная",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81367,19 +85284,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Shanghai": {
+            "amenity/cafe/คาเฟ่ อเมซอน": {
                 "tags": {
                 "tags": {
-                    "name": "Shanghai",
-                    "amenity": "restaurant"
+                    "name": "คาเฟ่ อเมซอน",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Shanghai",
-                "icon": "restaurant",
+                "name": "คาเฟ่ อเมซอน",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81387,19 +85305,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Shari's": {
+            "amenity/cafe/Traveler's Coffee": {
                 "tags": {
                 "tags": {
-                    "name": "Shari's",
-                    "amenity": "restaurant"
+                    "name": "Traveler's Coffee",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Shari's",
-                "icon": "restaurant",
+                "name": "Traveler's Coffee",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81407,19 +85326,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Sonne": {
+            "amenity/cafe/カフェ・ド・クリエ": {
                 "tags": {
                 "tags": {
-                    "name": "Sonne",
-                    "amenity": "restaurant"
+                    "name": "カフェ・ド・クリエ",
+                    "name:en": "Cafe de CRIE",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Sonne",
-                "icon": "restaurant",
+                "name": "カフェ・ド・クリエ",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81427,19 +85348,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Sportheim": {
+            "amenity/cafe/Cafe Amazon": {
                 "tags": {
                 "tags": {
-                    "name": "Sportheim",
-                    "amenity": "restaurant"
+                    "name": "Cafe Amazon",
+                    "amenity": "cafe"
                 },
                 },
-                "name": "Sportheim",
-                "icon": "restaurant",
+                "name": "Cafe Amazon",
+                "icon": "cafe",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -81447,4302 +85369,4294 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "cuisine",
                 ],
                 "fields": [
                     "cuisine",
+                    "internet_access",
                     "building_area",
                     "address",
                     "building_area",
                     "address",
-                    "capacity"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Spur": {
+            "shop/supermarket/Budgens": {
                 "tags": {
                 "tags": {
-                    "name": "Spur",
-                    "amenity": "restaurant"
+                    "name": "Budgens",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Spur",
-                "icon": "restaurant",
+                "name": "Budgens",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Sternen": {
+            "shop/supermarket/Interspar": {
                 "tags": {
                 "tags": {
-                    "name": "Sternen",
-                    "amenity": "restaurant"
+                    "name": "Interspar",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Sternen",
-                "icon": "restaurant",
+                "name": "Interspar",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Swiss Chalet": {
+            "shop/supermarket/Merkur": {
                 "tags": {
                 "tags": {
-                    "name": "Swiss Chalet",
-                    "amenity": "restaurant"
+                    "name": "Merkur",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Swiss Chalet",
-                "icon": "restaurant",
+                "name": "Merkur",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/TGI Friday's": {
+            "shop/supermarket/Lidl": {
                 "tags": {
                 "tags": {
-                    "name": "TGI Friday's",
-                    "amenity": "restaurant"
+                    "name": "Lidl",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "TGI Friday's",
-                "icon": "restaurant",
+                "name": "Lidl",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Taj Mahal": {
+            "shop/supermarket/EDEKA": {
                 "tags": {
                 "tags": {
-                    "name": "Taj Mahal",
-                    "amenity": "restaurant"
+                    "name": "EDEKA",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Taj Mahal",
-                "icon": "restaurant",
+                "name": "EDEKA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Texas Roadhouse": {
+            "shop/supermarket/Coles": {
                 "tags": {
                 "tags": {
-                    "name": "Texas Roadhouse",
-                    "amenity": "restaurant"
+                    "name": "Coles",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Texas Roadhouse",
-                "icon": "restaurant",
+                "name": "Coles",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/The Keg": {
+            "shop/supermarket/Iceland": {
                 "tags": {
                 "tags": {
-                    "name": "The Keg",
-                    "amenity": "restaurant"
+                    "name": "Iceland",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "The Keg",
-                "icon": "restaurant",
+                "name": "Iceland",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Traube": {
+            "shop/supermarket/Woolworths": {
                 "tags": {
                 "tags": {
-                    "name": "Traube",
-                    "amenity": "restaurant"
+                    "name": "Woolworths",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Traube",
-                "icon": "restaurant",
+                "name": "Woolworths",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Vapiano": {
+            "shop/supermarket/Zielpunkt": {
                 "tags": {
                 "tags": {
-                    "name": "Vapiano",
-                    "amenity": "restaurant"
+                    "name": "Zielpunkt",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Vapiano",
-                "icon": "restaurant",
+                "name": "Zielpunkt",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Village Inn": {
+            "shop/supermarket/Nahkauf": {
                 "tags": {
                 "tags": {
-                    "name": "Village Inn",
-                    "amenity": "restaurant"
+                    "name": "Nahkauf",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Village Inn",
-                "icon": "restaurant",
+                "name": "Nahkauf",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Vips": {
+            "shop/supermarket/Billa": {
                 "tags": {
                 "tags": {
-                    "name": "Vips",
-                    "amenity": "restaurant"
+                    "name": "Billa",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Vips",
-                "icon": "restaurant",
+                "name": "Billa",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Waffle House": {
+            "shop/supermarket/Kaufland": {
                 "tags": {
                 "tags": {
-                    "name": "Waffle House",
-                    "amenity": "restaurant"
+                    "name": "Kaufland",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Waffle House",
-                "icon": "restaurant",
+                "name": "Kaufland",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Wagamama": {
+            "shop/supermarket/Plus": {
                 "tags": {
                 "tags": {
-                    "name": "Wagamama",
-                    "amenity": "restaurant"
+                    "name": "Plus",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Wagamama",
-                "icon": "restaurant",
+                "name": "Plus",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Waldschänke": {
+            "shop/supermarket/ALDI": {
                 "tags": {
                 "tags": {
-                    "name": "Waldschänke",
-                    "amenity": "restaurant"
+                    "name": "ALDI",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Waldschänke",
-                "icon": "restaurant",
+                "name": "ALDI",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zizzi": {
+            "shop/supermarket/Checkers": {
                 "tags": {
                 "tags": {
-                    "name": "Zizzi",
-                    "amenity": "restaurant"
+                    "name": "Checkers",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Zizzi",
-                "icon": "restaurant",
+                "name": "Checkers",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zum Löwen": {
+            "shop/supermarket/Tesco Metro": {
                 "tags": {
                 "tags": {
-                    "name": "Zum Löwen",
-                    "amenity": "restaurant"
+                    "name": "Tesco Metro",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Zum Löwen",
-                "icon": "restaurant",
+                "name": "Tesco Metro",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zur Krone": {
+            "shop/supermarket/NP": {
                 "tags": {
                 "tags": {
-                    "name": "Zur Krone",
-                    "amenity": "restaurant"
+                    "name": "NP",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Zur Krone",
-                "icon": "restaurant",
+                "name": "NP",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zur Linde": {
+            "shop/supermarket/Penny": {
                 "tags": {
                 "tags": {
-                    "name": "Zur Linde",
-                    "amenity": "restaurant"
+                    "name": "Penny",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Zur Linde",
-                "icon": "restaurant",
+                "name": "Penny",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zur Post": {
+            "shop/supermarket/Norma": {
                 "tags": {
                 "tags": {
-                    "name": "Zur Post",
-                    "amenity": "restaurant"
+                    "name": "Norma",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Zur Post",
-                "icon": "restaurant",
+                "name": "Norma",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Zur Sonne": {
+            "shop/supermarket/Asda": {
                 "tags": {
                 "tags": {
-                    "name": "Zur Sonne",
-                    "amenity": "restaurant"
+                    "name": "Asda",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Zur Sonne",
-                "icon": "restaurant",
+                "name": "Asda",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Евразия": {
+            "shop/supermarket/Netto": {
                 "tags": {
                 "tags": {
-                    "name": "Евразия",
-                    "amenity": "restaurant"
+                    "name": "Netto",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Евразия",
-                "icon": "restaurant",
+                "name": "Netto",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/Якитория": {
+            "shop/supermarket/REWE": {
                 "tags": {
                 "tags": {
-                    "name": "Якитория",
-                    "amenity": "restaurant"
+                    "name": "REWE",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Якитория",
-                "icon": "restaurant",
+                "name": "REWE",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/ガスト": {
+            "shop/supermarket/Rewe": {
                 "tags": {
                 "tags": {
-                    "name": "ガスト",
-                    "name:en": "Gusto",
-                    "amenity": "restaurant"
+                    "name": "Rewe",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "ガスト",
-                "icon": "restaurant",
+                "name": "Rewe",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/サイゼリヤ": {
+            "shop/supermarket/Aldi Süd": {
                 "tags": {
                 "tags": {
-                    "name": "サイゼリヤ",
-                    "amenity": "restaurant"
+                    "name": "Aldi Süd",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "サイゼリヤ",
-                "icon": "restaurant",
+                "name": "Aldi Süd",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/ジョナサン": {
+            "shop/supermarket/Real": {
                 "tags": {
                 "tags": {
-                    "name": "ジョナサン",
-                    "amenity": "restaurant"
+                    "name": "Real",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "ジョナサン",
-                "icon": "restaurant",
+                "name": "Real",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/デニーズ": {
+            "shop/supermarket/Tesco Express": {
                 "tags": {
                 "tags": {
-                    "name": "デニーズ",
-                    "amenity": "restaurant"
+                    "name": "Tesco Express",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "デニーズ",
-                "icon": "restaurant",
+                "name": "Tesco Express",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "amenity/restaurant/바다횟집 (Bada Fish Restaurant)": {
+            "shop/supermarket/King Soopers": {
                 "tags": {
                 "tags": {
-                    "name": "바다횟집 (Bada Fish Restaurant)",
-                    "amenity": "restaurant"
+                    "name": "King Soopers",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "바다횟집 (Bada Fish Restaurant)",
-                "icon": "restaurant",
+                "name": "King Soopers",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "cuisine",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "address",
-                    "capacity"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Alko": {
+            "shop/supermarket/Kiwi": {
                 "tags": {
                 "tags": {
-                    "name": "Alko",
-                    "shop": "alcohol"
+                    "name": "Kiwi",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Alko",
-                "icon": "alcohol-shop",
+                "name": "Kiwi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/BWS": {
+            "shop/supermarket/Edeka": {
                 "tags": {
                 "tags": {
-                    "name": "BWS",
-                    "shop": "alcohol"
+                    "name": "Edeka",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "BWS",
-                "icon": "alcohol-shop",
+                "name": "Edeka",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Bargain Booze": {
+            "shop/supermarket/Pick n Pay": {
                 "tags": {
                 "tags": {
-                    "name": "Bargain Booze",
-                    "shop": "alcohol"
+                    "name": "Pick n Pay",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Bargain Booze",
-                "icon": "alcohol-shop",
+                "name": "Pick n Pay",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Botilleria": {
+            "shop/supermarket/ICA": {
                 "tags": {
                 "tags": {
-                    "name": "Botilleria",
-                    "shop": "alcohol"
+                    "name": "ICA",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Botilleria",
-                "icon": "alcohol-shop",
+                "name": "ICA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Gall & Gall": {
+            "shop/supermarket/Tengelmann": {
                 "tags": {
                 "tags": {
-                    "name": "Gall & Gall",
-                    "shop": "alcohol"
+                    "name": "Tengelmann",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Gall & Gall",
-                "icon": "alcohol-shop",
+                "name": "Tengelmann",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/LCBO": {
+            "shop/supermarket/Waitrose": {
                 "tags": {
                 "tags": {
-                    "name": "LCBO",
-                    "shop": "alcohol"
+                    "name": "Waitrose",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "LCBO",
-                "icon": "alcohol-shop",
+                "name": "Waitrose",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Nicolas": {
+            "shop/supermarket/Spar": {
                 "tags": {
                 "tags": {
-                    "name": "Nicolas",
-                    "shop": "alcohol"
+                    "name": "Spar",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Nicolas",
-                "icon": "alcohol-shop",
+                "name": "Spar",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/SAQ": {
+            "shop/supermarket/Hofer": {
                 "tags": {
                 "tags": {
-                    "name": "SAQ",
-                    "shop": "alcohol"
+                    "name": "Hofer",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "SAQ",
-                "icon": "alcohol-shop",
+                "name": "Hofer",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Systembolaget": {
+            "shop/supermarket/M-Preis": {
                 "tags": {
                 "tags": {
-                    "name": "Systembolaget",
-                    "shop": "alcohol"
+                    "name": "M-Preis",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Systembolaget",
-                "icon": "alcohol-shop",
+                "name": "M-Preis",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/The Beer Store": {
+            "shop/supermarket/LIDL": {
                 "tags": {
                 "tags": {
-                    "name": "The Beer Store",
-                    "shop": "alcohol"
+                    "name": "LIDL",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "The Beer Store",
-                "icon": "alcohol-shop",
+                "name": "LIDL",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Ароматный мир": {
+            "shop/supermarket/tegut": {
                 "tags": {
                 "tags": {
-                    "name": "Ароматный мир",
-                    "shop": "alcohol"
+                    "name": "tegut",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Ароматный мир",
-                "icon": "alcohol-shop",
+                "name": "tegut",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/alcohol/Живое пиво": {
+            "shop/supermarket/Sainsbury's Local": {
                 "tags": {
                 "tags": {
-                    "name": "Живое пиво",
-                    "shop": "alcohol"
+                    "name": "Sainsbury's Local",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Живое пиво",
-                "icon": "alcohol-shop",
+                "name": "Sainsbury's Local",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Anker": {
+            "shop/supermarket/E-Center": {
                 "tags": {
                 "tags": {
-                    "name": "Anker",
-                    "shop": "bakery"
+                    "name": "E-Center",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Anker",
-                "icon": "bakery",
+                "name": "E-Center",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Backwerk": {
+            "shop/supermarket/Aldi Nord": {
                 "tags": {
                 "tags": {
-                    "name": "Backwerk",
-                    "shop": "bakery"
+                    "name": "Aldi Nord",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Backwerk",
-                "icon": "bakery",
+                "name": "Aldi Nord",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Boulangerie": {
+            "shop/supermarket/nahkauf": {
                 "tags": {
                 "tags": {
-                    "name": "Boulangerie",
-                    "shop": "bakery"
+                    "name": "nahkauf",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Boulangerie",
-                "icon": "bakery",
+                "name": "nahkauf",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Boulangerie Patisserie": {
+            "shop/supermarket/Meijer": {
                 "tags": {
                 "tags": {
-                    "name": "Boulangerie Patisserie",
-                    "shop": "bakery"
+                    "name": "Meijer",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Boulangerie Patisserie",
-                "icon": "bakery",
+                "name": "Meijer",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Bäcker": {
+            "shop/supermarket/Safeway": {
                 "tags": {
                 "tags": {
-                    "name": "Bäcker",
-                    "shop": "bakery"
+                    "name": "Safeway",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Bäcker",
-                "icon": "bakery",
+                "name": "Safeway",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Bäckerei": {
+            "shop/supermarket/Costco": {
                 "tags": {
                 "tags": {
-                    "name": "Bäckerei",
-                    "shop": "bakery"
+                    "name": "Costco",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Bäckerei",
-                "icon": "bakery",
+                "name": "Costco",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Bäckerei Schmidt": {
+            "shop/supermarket/Albert": {
                 "tags": {
                 "tags": {
-                    "name": "Bäckerei Schmidt",
-                    "shop": "bakery"
+                    "name": "Albert",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Bäckerei Schmidt",
-                "icon": "bakery",
+                "name": "Albert",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Dat Backhus": {
+            "shop/supermarket/Jumbo": {
                 "tags": {
                 "tags": {
-                    "name": "Dat Backhus",
-                    "shop": "bakery"
+                    "name": "Jumbo",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Dat Backhus",
-                "icon": "bakery",
+                "name": "Jumbo",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Der Beck": {
+            "shop/supermarket/Shoprite": {
                 "tags": {
                 "tags": {
-                    "name": "Der Beck",
-                    "shop": "bakery"
+                    "name": "Shoprite",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Der Beck",
-                "icon": "bakery",
+                "name": "Shoprite",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Goeken backen": {
+            "shop/supermarket/MPreis": {
                 "tags": {
                 "tags": {
-                    "name": "Goeken backen",
-                    "shop": "bakery"
+                    "name": "MPreis",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Goeken backen",
-                "icon": "bakery",
+                "name": "MPreis",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Goldilocks": {
+            "shop/supermarket/Penny Market": {
                 "tags": {
                 "tags": {
-                    "name": "Goldilocks",
-                    "shop": "bakery"
+                    "name": "Penny Market",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Goldilocks",
-                "icon": "bakery",
+                "name": "Penny Market",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Greggs": {
+            "shop/supermarket/Tesco Extra": {
                 "tags": {
                 "tags": {
-                    "name": "Greggs",
-                    "shop": "bakery"
+                    "name": "Tesco Extra",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Greggs",
-                "icon": "bakery",
+                "name": "Tesco Extra",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Hofpfisterei": {
+            "shop/supermarket/Albert Heijn": {
                 "tags": {
                 "tags": {
-                    "name": "Hofpfisterei",
-                    "shop": "bakery"
+                    "name": "Albert Heijn",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Hofpfisterei",
-                "icon": "bakery",
+                "name": "Albert Heijn",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Ihle": {
+            "shop/supermarket/IGA": {
                 "tags": {
                 "tags": {
-                    "name": "Ihle",
-                    "shop": "bakery"
+                    "name": "IGA",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Ihle",
-                "icon": "bakery",
+                "name": "IGA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/K&U": {
+            "shop/supermarket/Metro": {
                 "tags": {
                 "tags": {
-                    "name": "K&U",
-                    "shop": "bakery"
+                    "name": "Metro",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "K&U",
-                "icon": "bakery",
+                "name": "Metro",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Kamps": {
+            "shop/supermarket/Neukauf": {
                 "tags": {
                 "tags": {
-                    "name": "Kamps",
-                    "shop": "bakery"
+                    "name": "Neukauf",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Kamps",
-                "icon": "bakery",
+                "name": "Neukauf",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Oebel": {
+            "shop/supermarket/Migros": {
                 "tags": {
                 "tags": {
-                    "name": "Oebel",
-                    "shop": "bakery"
+                    "name": "Migros",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Oebel",
-                "icon": "bakery",
+                "name": "Migros",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Panaderia": {
+            "shop/supermarket/Marktkauf": {
                 "tags": {
                 "tags": {
-                    "name": "Panaderia",
-                    "shop": "bakery"
+                    "name": "Marktkauf",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Panaderia",
-                "icon": "bakery",
+                "name": "Marktkauf",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Panificio": {
+            "shop/supermarket/Delikatesy Centrum": {
                 "tags": {
                 "tags": {
-                    "name": "Panificio",
-                    "shop": "bakery"
+                    "name": "Delikatesy Centrum",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Panificio",
-                "icon": "bakery",
+                "name": "Delikatesy Centrum",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Paul": {
+            "shop/supermarket/C1000": {
                 "tags": {
                 "tags": {
-                    "name": "Paul",
-                    "shop": "bakery"
+                    "name": "C1000",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Paul",
-                "icon": "bakery",
+                "name": "C1000",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Piekarnia": {
+            "shop/supermarket/Hoogvliet": {
                 "tags": {
                 "tags": {
-                    "name": "Piekarnia",
-                    "shop": "bakery"
+                    "name": "Hoogvliet",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Piekarnia",
-                "icon": "bakery",
+                "name": "Hoogvliet",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Stadtbäckerei": {
+            "shop/supermarket/COOP": {
                 "tags": {
                 "tags": {
-                    "name": "Stadtbäckerei",
-                    "shop": "bakery"
+                    "name": "COOP",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Stadtbäckerei",
-                "icon": "bakery",
+                "name": "COOP",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Stadtbäckerei Junge": {
+            "shop/supermarket/Food Basics": {
                 "tags": {
                 "tags": {
-                    "name": "Stadtbäckerei Junge",
-                    "shop": "bakery"
+                    "name": "Food Basics",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Stadtbäckerei Junge",
-                "icon": "bakery",
+                "name": "Food Basics",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Steinecke": {
+            "shop/supermarket/Casino": {
                 "tags": {
                 "tags": {
-                    "name": "Steinecke",
-                    "shop": "bakery"
+                    "name": "Casino",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Steinecke",
-                "icon": "bakery",
+                "name": "Casino",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Thürmann": {
+            "shop/supermarket/Penny Markt": {
                 "tags": {
                 "tags": {
-                    "name": "Thürmann",
-                    "shop": "bakery"
+                    "name": "Penny Markt",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Thürmann",
-                "icon": "bakery",
+                "name": "Penny Markt",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/bakery/Хлеб": {
+            "shop/supermarket/Giant": {
                 "tags": {
                 "tags": {
-                    "name": "Хлеб",
-                    "shop": "bakery"
+                    "name": "Giant",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Хлеб",
-                "icon": "bakery",
+                "name": "Giant",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/books/Barnes & Noble": {
+            "shop/supermarket/COOP Jednota": {
                 "tags": {
                 "tags": {
-                    "name": "Barnes & Noble",
-                    "shop": "books"
+                    "name": "COOP Jednota",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Barnes & Noble",
-                "icon": "shop",
+                "name": "COOP Jednota",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/books/Bruna": {
+            "shop/supermarket/Rema 1000": {
                 "tags": {
                 "tags": {
-                    "name": "Bruna",
-                    "shop": "books"
+                    "name": "Rema 1000",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Bruna",
-                "icon": "shop",
+                "name": "Rema 1000",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/books/Libro": {
+            "shop/supermarket/Kaufpark": {
                 "tags": {
                 "tags": {
-                    "name": "Libro",
-                    "shop": "books"
+                    "name": "Kaufpark",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Libro",
-                "icon": "shop",
+                "name": "Kaufpark",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/books/Thalia": {
+            "shop/supermarket/ALDI SÜD": {
                 "tags": {
                 "tags": {
-                    "name": "Thalia",
-                    "shop": "books"
+                    "name": "ALDI SÜD",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Thalia",
-                "icon": "shop",
+                "name": "ALDI SÜD",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/books/Waterstones": {
+            "shop/supermarket/Simply Market": {
                 "tags": {
                 "tags": {
-                    "name": "Waterstones",
-                    "shop": "books"
+                    "name": "Simply Market",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Waterstones",
-                "icon": "shop",
+                "name": "Simply Market",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/books/Weltbild": {
+            "shop/supermarket/Konzum": {
                 "tags": {
                 "tags": {
-                    "name": "Weltbild",
-                    "shop": "books"
+                    "name": "Konzum",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Weltbild",
-                "icon": "shop",
+                "name": "Konzum",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/books/Книги": {
+            "shop/supermarket/Carrefour Express": {
                 "tags": {
                 "tags": {
-                    "name": "Книги",
-                    "shop": "books"
+                    "name": "Carrefour Express",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Книги",
-                "icon": "shop",
+                "name": "Carrefour Express",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/ATU": {
+            "shop/supermarket/Eurospar": {
                 "tags": {
                 "tags": {
-                    "name": "ATU",
-                    "shop": "car_repair"
+                    "name": "Eurospar",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "ATU",
-                "icon": "shop",
+                "name": "Eurospar",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/AutoZone": {
+            "shop/supermarket/Mercator": {
                 "tags": {
                 "tags": {
-                    "name": "AutoZone",
-                    "shop": "car_repair"
+                    "name": "Mercator",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "AutoZone",
-                "icon": "shop",
+                "name": "Mercator",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Carglass": {
+            "shop/supermarket/Mercadona": {
                 "tags": {
                 "tags": {
-                    "name": "Carglass",
-                    "shop": "car_repair"
+                    "name": "Mercadona",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Carglass",
-                "icon": "shop",
+                "name": "Mercadona",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Euromaster": {
+            "shop/supermarket/Famila": {
                 "tags": {
                 "tags": {
-                    "name": "Euromaster",
-                    "shop": "car_repair"
+                    "name": "Famila",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Euromaster",
-                "icon": "shop",
+                "name": "Famila",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Feu Vert": {
+            "shop/supermarket/Hemköp": {
                 "tags": {
                 "tags": {
-                    "name": "Feu Vert",
-                    "shop": "car_repair"
+                    "name": "Hemköp",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Feu Vert",
-                "icon": "shop",
+                "name": "Hemköp",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Firestone": {
+            "shop/supermarket/real,-": {
                 "tags": {
                 "tags": {
-                    "name": "Firestone",
-                    "shop": "car_repair"
+                    "name": "real,-",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Firestone",
-                "icon": "shop",
+                "name": "real,-",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Jiffy Lube": {
+            "shop/supermarket/Markant": {
                 "tags": {
                 "tags": {
-                    "name": "Jiffy Lube",
-                    "shop": "car_repair"
+                    "name": "Markant",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Jiffy Lube",
-                "icon": "shop",
+                "name": "Markant",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Kwik Fit": {
+            "shop/supermarket/Volg": {
                 "tags": {
                 "tags": {
-                    "name": "Kwik Fit",
-                    "shop": "car_repair"
+                    "name": "Volg",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Kwik Fit",
-                "icon": "shop",
+                "name": "Volg",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Midas": {
+            "shop/supermarket/Leader Price": {
                 "tags": {
                 "tags": {
-                    "name": "Midas",
-                    "shop": "car_repair"
+                    "name": "Leader Price",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Midas",
-                "icon": "shop",
+                "name": "Leader Price",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Norauto": {
+            "shop/supermarket/Treff 3000": {
                 "tags": {
                 "tags": {
-                    "name": "Norauto",
-                    "shop": "car_repair"
+                    "name": "Treff 3000",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Norauto",
-                "icon": "shop",
+                "name": "Treff 3000",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/O'Reilly Auto Parts": {
+            "shop/supermarket/SuperBrugsen": {
                 "tags": {
                 "tags": {
-                    "name": "O'Reilly Auto Parts",
-                    "shop": "car_repair"
+                    "name": "SuperBrugsen",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "O'Reilly Auto Parts",
-                "icon": "shop",
+                "name": "SuperBrugsen",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Peugeot": {
+            "shop/supermarket/Kaiser's": {
                 "tags": {
                 "tags": {
-                    "name": "Peugeot",
-                    "shop": "car_repair"
+                    "name": "Kaiser's",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Peugeot",
-                "icon": "shop",
+                "name": "Kaiser's",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Pit Stop": {
+            "shop/supermarket/K+K": {
                 "tags": {
                 "tags": {
-                    "name": "Pit Stop",
-                    "shop": "car_repair"
+                    "name": "K+K",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Pit Stop",
-                "icon": "shop",
+                "name": "K+K",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Renault": {
+            "shop/supermarket/Unimarkt": {
                 "tags": {
                 "tags": {
-                    "name": "Renault",
-                    "shop": "car_repair"
+                    "name": "Unimarkt",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Renault",
-                "icon": "shop",
+                "name": "Unimarkt",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Roady": {
+            "shop/supermarket/Sobeys": {
                 "tags": {
                 "tags": {
-                    "name": "Roady",
-                    "shop": "car_repair"
+                    "name": "Sobeys",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Roady",
-                "icon": "shop",
+                "name": "Sobeys",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Speedy": {
+            "shop/supermarket/S-Market": {
                 "tags": {
                 "tags": {
-                    "name": "Speedy",
-                    "shop": "car_repair"
+                    "name": "S-Market",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Speedy",
-                "icon": "shop",
+                "name": "S-Market",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/ÖAMTC": {
+            "shop/supermarket/Combi": {
                 "tags": {
                 "tags": {
-                    "name": "ÖAMTC",
-                    "shop": "car_repair"
+                    "name": "Combi",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "ÖAMTC",
-                "icon": "shop",
+                "name": "Combi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Автозапчасти": {
+            "shop/supermarket/Denner": {
                 "tags": {
                 "tags": {
-                    "name": "Автозапчасти",
-                    "shop": "car_repair"
+                    "name": "Denner",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Автозапчасти",
-                "icon": "shop",
+                "name": "Denner",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Автосервис": {
+            "shop/supermarket/Konsum": {
                 "tags": {
                 "tags": {
-                    "name": "Автосервис",
-                    "shop": "car_repair"
+                    "name": "Konsum",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Автосервис",
-                "icon": "shop",
+                "name": "Konsum",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/СТО": {
+            "shop/supermarket/Franprix": {
                 "tags": {
                 "tags": {
-                    "name": "СТО",
-                    "shop": "car_repair"
+                    "name": "Franprix",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "СТО",
-                "icon": "shop",
+                "name": "Franprix",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Шиномонтаж": {
+            "shop/supermarket/Monoprix": {
                 "tags": {
                 "tags": {
-                    "name": "Шиномонтаж",
-                    "shop": "car_repair"
+                    "name": "Monoprix",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Шиномонтаж",
-                "icon": "shop",
+                "name": "Monoprix",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Audi": {
+            "shop/supermarket/Diska": {
                 "tags": {
                 "tags": {
-                    "name": "Audi",
-                    "shop": "car"
+                    "name": "Diska",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Audi",
-                "icon": "car",
+                "name": "Diska",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/BMW": {
+            "shop/supermarket/PENNY": {
                 "tags": {
                 "tags": {
-                    "name": "BMW",
-                    "shop": "car"
+                    "name": "PENNY",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "BMW",
-                "icon": "car",
+                "name": "PENNY",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Chevrolet": {
+            "shop/supermarket/Dia": {
                 "tags": {
                 "tags": {
-                    "name": "Chevrolet",
-                    "shop": "car"
+                    "name": "Dia",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Chevrolet",
-                "icon": "car",
+                "name": "Dia",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Citroen": {
+            "shop/supermarket/Giant Eagle": {
                 "tags": {
                 "tags": {
-                    "name": "Citroen",
-                    "shop": "car"
+                    "name": "Giant Eagle",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Citroen",
-                "icon": "car",
+                "name": "Giant Eagle",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Fiat": {
+            "shop/supermarket/NORMA": {
                 "tags": {
                 "tags": {
-                    "name": "Fiat",
-                    "shop": "car"
+                    "name": "NORMA",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Fiat",
-                "icon": "car",
+                "name": "NORMA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Ford": {
+            "shop/supermarket/AD Delhaize": {
                 "tags": {
                 "tags": {
-                    "name": "Ford",
-                    "shop": "car"
+                    "name": "AD Delhaize",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Ford",
-                "icon": "car",
+                "name": "AD Delhaize",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Honda": {
+            "shop/supermarket/Consum": {
                 "tags": {
                 "tags": {
-                    "name": "Honda",
-                    "shop": "car"
+                    "name": "Consum",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Honda",
-                "icon": "car",
+                "name": "Consum",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Hyundai": {
+            "shop/supermarket/Carrefour Market": {
                 "tags": {
                 "tags": {
-                    "name": "Hyundai",
-                    "shop": "car"
+                    "name": "Carrefour Market",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Hyundai",
-                "icon": "car",
+                "name": "Carrefour Market",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Mazda": {
+            "shop/supermarket/Carrefour City": {
                 "tags": {
                 "tags": {
-                    "name": "Mazda",
-                    "shop": "car"
+                    "name": "Carrefour City",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Mazda",
-                "icon": "car",
+                "name": "Carrefour City",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Mercedes-Benz": {
+            "shop/supermarket/Pam": {
                 "tags": {
                 "tags": {
-                    "name": "Mercedes-Benz",
-                    "shop": "car"
+                    "name": "Pam",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Mercedes-Benz",
-                "icon": "car",
+                "name": "Pam",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Mitsubishi": {
+            "shop/supermarket/Despar": {
                 "tags": {
                 "tags": {
-                    "name": "Mitsubishi",
-                    "shop": "car"
+                    "name": "Despar",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Mitsubishi",
-                "icon": "car",
+                "name": "Despar",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Nissan": {
-                "tags": {
-                    "name": "Nissan",
-                    "shop": "car"
+            "shop/supermarket/Eroski": {
+                "tags": {
+                    "name": "Eroski",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Nissan",
-                "icon": "car",
+                "name": "Eroski",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Opel": {
+            "shop/supermarket/Costcutter": {
                 "tags": {
                 "tags": {
-                    "name": "Opel",
-                    "shop": "car"
+                    "name": "Costcutter",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Opel",
-                "icon": "car",
+                "name": "Costcutter",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Skoda": {
+            "shop/supermarket/Maxi": {
                 "tags": {
                 "tags": {
-                    "name": "Skoda",
-                    "shop": "car"
+                    "name": "Maxi",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Skoda",
-                "icon": "car",
+                "name": "Maxi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Suzuki": {
+            "shop/supermarket/Colruyt": {
                 "tags": {
                 "tags": {
-                    "name": "Suzuki",
-                    "shop": "car"
+                    "name": "Colruyt",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Suzuki",
-                "icon": "car",
+                "name": "Colruyt",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Toyota": {
+            "shop/supermarket/The Co-operative": {
                 "tags": {
                 "tags": {
-                    "name": "Toyota",
-                    "shop": "car"
+                    "name": "The Co-operative",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Toyota",
-                "icon": "car",
+                "name": "The Co-operative",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Volkswagen": {
+            "shop/supermarket/sky": {
                 "tags": {
                 "tags": {
-                    "name": "Volkswagen",
-                    "shop": "car"
+                    "name": "sky",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Volkswagen",
-                "icon": "car",
+                "name": "sky",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Volvo": {
+            "shop/supermarket/Delhaize": {
                 "tags": {
                 "tags": {
-                    "name": "Volvo",
-                    "shop": "car"
+                    "name": "Delhaize",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Volvo",
-                "icon": "car",
+                "name": "Delhaize",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/car/Автомагазин": {
+            "shop/supermarket/CBA": {
                 "tags": {
                 "tags": {
-                    "name": "Автомагазин",
-                    "shop": "car"
+                    "name": "CBA",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Автомагазин",
-                "icon": "car",
+                "name": "CBA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
-                    "opening_hours"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Bipa": {
+            "shop/supermarket/Shopi": {
                 "tags": {
                 "tags": {
-                    "name": "Bipa",
-                    "shop": "chemist"
+                    "name": "Shopi",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Bipa",
-                "icon": "shop",
+                "name": "Shopi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/chemist/dm": {
+            "shop/supermarket/Walmart": {
                 "tags": {
                 "tags": {
-                    "name": "dm",
-                    "shop": "chemist"
+                    "name": "Walmart",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "dm",
-                "icon": "shop",
+                "name": "Walmart",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Douglas": {
+            "shop/supermarket/Kroger": {
                 "tags": {
                 "tags": {
-                    "name": "Douglas",
-                    "shop": "chemist"
+                    "name": "Kroger",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Douglas",
-                "icon": "shop",
+                "name": "Kroger",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Etos": {
+            "shop/supermarket/Albertsons": {
                 "tags": {
                 "tags": {
-                    "name": "Etos",
-                    "shop": "chemist"
+                    "name": "Albertsons",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Etos",
-                "icon": "shop",
+                "name": "Albertsons",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Ihr Platz": {
+            "shop/supermarket/Trader Joe's": {
                 "tags": {
                 "tags": {
-                    "name": "Ihr Platz",
-                    "shop": "chemist"
+                    "name": "Trader Joe's",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Ihr Platz",
-                "icon": "shop",
+                "name": "Trader Joe's",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Kruidvat": {
+            "shop/supermarket/Feneberg": {
                 "tags": {
                 "tags": {
-                    "name": "Kruidvat",
-                    "shop": "chemist"
+                    "name": "Feneberg",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Kruidvat",
-                "icon": "shop",
+                "name": "Feneberg",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Müller": {
+            "shop/supermarket/dm": {
                 "tags": {
                 "tags": {
-                    "name": "Müller",
-                    "shop": "chemist"
+                    "name": "dm",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Müller",
-                "icon": "shop",
+                "name": "dm",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Rossmann": {
+            "shop/supermarket/Kvickly": {
                 "tags": {
                 "tags": {
-                    "name": "Rossmann",
-                    "shop": "chemist"
+                    "name": "Kvickly",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Rossmann",
-                "icon": "shop",
+                "name": "Kvickly",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/chemist/Schlecker": {
+            "shop/supermarket/Makro": {
                 "tags": {
                 "tags": {
-                    "name": "Schlecker",
-                    "shop": "chemist"
+                    "name": "Makro",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Schlecker",
-                "icon": "shop",
+                "name": "Makro",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/AWG": {
+            "shop/supermarket/Nah & Frisch": {
                 "tags": {
                 "tags": {
-                    "name": "AWG",
-                    "shop": "clothes"
+                    "name": "Nah & Frisch",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "AWG",
-                "icon": "clothing-store",
+                "name": "Nah & Frisch",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Ackermans": {
+            "shop/supermarket/Champion": {
                 "tags": {
                 "tags": {
-                    "name": "Ackermans",
-                    "shop": "clothes"
+                    "name": "Champion",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Ackermans",
-                "icon": "clothing-store",
+                "name": "Champion",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Adidas": {
+            "shop/supermarket/Fakta": {
                 "tags": {
                 "tags": {
-                    "name": "Adidas",
-                    "shop": "clothes"
+                    "name": "Fakta",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Adidas",
-                "icon": "clothing-store",
+                "name": "Fakta",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/American Apparel": {
+            "shop/supermarket/Магнит": {
                 "tags": {
                 "tags": {
-                    "name": "American Apparel",
-                    "shop": "clothes"
+                    "name": "Магнит",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "American Apparel",
-                "icon": "clothing-store",
+                "name": "Магнит",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Benetton": {
+            "shop/supermarket/Caprabo": {
                 "tags": {
                 "tags": {
-                    "name": "Benetton",
-                    "shop": "clothes"
+                    "name": "Caprabo",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Benetton",
-                "icon": "clothing-store",
+                "name": "Caprabo",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Bonita": {
+            "shop/supermarket/Famiglia Cooperativa": {
                 "tags": {
                 "tags": {
-                    "name": "Bonita",
-                    "shop": "clothes"
+                    "name": "Famiglia Cooperativa",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Bonita",
-                "icon": "clothing-store",
+                "name": "Famiglia Cooperativa",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/C&A": {
+            "shop/supermarket/Народная 7Я семьЯ": {
                 "tags": {
                 "tags": {
-                    "name": "C&A",
-                    "shop": "clothes"
+                    "name": "Народная 7Я семьЯ",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "C&A",
-                "icon": "clothing-store",
+                "name": "Народная 7Я семьЯ",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Calzedonia": {
+            "shop/supermarket/Esselunga": {
                 "tags": {
                 "tags": {
-                    "name": "Calzedonia",
-                    "shop": "clothes"
+                    "name": "Esselunga",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Calzedonia",
-                "icon": "clothing-store",
+                "name": "Esselunga",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Cecil": {
+            "shop/supermarket/Maxima": {
                 "tags": {
                 "tags": {
-                    "name": "Cecil",
-                    "shop": "clothes"
+                    "name": "Maxima",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Cecil",
-                "icon": "clothing-store",
+                "name": "Maxima",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Celio": {
+            "shop/supermarket/Petit Casino": {
                 "tags": {
                 "tags": {
-                    "name": "Celio",
-                    "shop": "clothes"
+                    "name": "Petit Casino",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Celio",
-                "icon": "clothing-store",
+                "name": "Petit Casino",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Charles Vögele": {
+            "shop/supermarket/Wasgau": {
                 "tags": {
                 "tags": {
-                    "name": "Charles Vögele",
-                    "shop": "clothes"
+                    "name": "Wasgau",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Charles Vögele",
-                "icon": "clothing-store",
+                "name": "Wasgau",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Deichmann": {
+            "shop/supermarket/Pingo Doce": {
                 "tags": {
                 "tags": {
-                    "name": "Deichmann",
-                    "shop": "clothes"
+                    "name": "Pingo Doce",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Deichmann",
-                "icon": "clothing-store",
+                "name": "Pingo Doce",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Dorothy Perkins": {
+            "shop/supermarket/Match": {
                 "tags": {
                 "tags": {
-                    "name": "Dorothy Perkins",
-                    "shop": "clothes"
+                    "name": "Match",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Dorothy Perkins",
-                "icon": "clothing-store",
+                "name": "Match",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Edgars": {
+            "shop/supermarket/Profi": {
                 "tags": {
                 "tags": {
-                    "name": "Edgars",
-                    "shop": "clothes"
+                    "name": "Profi",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Edgars",
-                "icon": "clothing-store",
+                "name": "Profi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Ernsting's family": {
+            "shop/supermarket/Lider": {
                 "tags": {
                 "tags": {
-                    "name": "Ernsting's family",
-                    "shop": "clothes"
+                    "name": "Lider",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Ernsting's family",
-                "icon": "clothing-store",
+                "name": "Lider",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Esprit": {
+            "shop/supermarket/Unimarc": {
                 "tags": {
                 "tags": {
-                    "name": "Esprit",
-                    "shop": "clothes"
+                    "name": "Unimarc",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Esprit",
-                "icon": "clothing-store",
+                "name": "Unimarc",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Etam": {
+            "shop/supermarket/Co-operative Food": {
                 "tags": {
                 "tags": {
-                    "name": "Etam",
-                    "shop": "clothes"
+                    "name": "Co-operative Food",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Etam",
-                "icon": "clothing-store",
+                "name": "Co-operative Food",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Gap": {
+            "shop/supermarket/Santa Isabel": {
                 "tags": {
                 "tags": {
-                    "name": "Gap",
-                    "shop": "clothes"
+                    "name": "Santa Isabel",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Gap",
-                "icon": "clothing-store",
+                "name": "Santa Isabel",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Gerry Weber": {
+            "shop/supermarket/Седьмой континент": {
                 "tags": {
                 "tags": {
-                    "name": "Gerry Weber",
-                    "shop": "clothes"
+                    "name": "Седьмой континент",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Gerry Weber",
-                "icon": "clothing-store",
+                "name": "Седьмой континент",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/H&M": {
+            "shop/supermarket/HIT": {
                 "tags": {
                 "tags": {
-                    "name": "H&M",
-                    "shop": "clothes"
+                    "name": "HIT",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "H&M",
-                "icon": "clothing-store",
+                "name": "HIT",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Jack & Jones": {
+            "shop/supermarket/Rimi": {
                 "tags": {
                 "tags": {
-                    "name": "Jack & Jones",
-                    "shop": "clothes"
+                    "name": "Rimi",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Jack & Jones",
-                "icon": "clothing-store",
+                "name": "Rimi",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Jack Wolfskin": {
+            "shop/supermarket/Conad": {
                 "tags": {
                 "tags": {
-                    "name": "Jack Wolfskin",
-                    "shop": "clothes"
+                    "name": "Conad",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Jack Wolfskin",
-                "icon": "clothing-store",
+                "name": "Conad",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Jules": {
+            "shop/supermarket/Фуршет": {
                 "tags": {
                 "tags": {
-                    "name": "Jules",
-                    "shop": "clothes"
+                    "name": "Фуршет",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Jules",
-                "icon": "clothing-store",
+                "name": "Фуршет",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/KiK": {
+            "shop/supermarket/Willys": {
                 "tags": {
                 "tags": {
-                    "name": "KiK",
-                    "shop": "clothes"
+                    "name": "Willys",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "KiK",
-                "icon": "clothing-store",
+                "name": "Willys",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Kiabi": {
+            "shop/supermarket/Farmfoods": {
                 "tags": {
                 "tags": {
-                    "name": "Kiabi",
-                    "shop": "clothes"
+                    "name": "Farmfoods",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Kiabi",
-                "icon": "clothing-store",
+                "name": "Farmfoods",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Lacoste": {
+            "shop/supermarket/Фора": {
                 "tags": {
                 "tags": {
-                    "name": "Lacoste",
-                    "shop": "clothes"
+                    "name": "Фора",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Lacoste",
-                "icon": "clothing-store",
+                "name": "Фора",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Levi's": {
+            "shop/supermarket/Dunnes Stores": {
                 "tags": {
                 "tags": {
-                    "name": "Levi's",
-                    "shop": "clothes"
+                    "name": "Dunnes Stores",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Levi's",
-                "icon": "clothing-store",
+                "name": "Dunnes Stores",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Lindex": {
+            "shop/supermarket/Сільпо": {
                 "tags": {
                 "tags": {
-                    "name": "Lindex",
-                    "shop": "clothes"
+                    "name": "Сільпо",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Lindex",
-                "icon": "clothing-store",
+                "name": "Сільпо",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Mango": {
+            "shop/supermarket/マルエツ": {
                 "tags": {
                 "tags": {
-                    "name": "Mango",
-                    "shop": "clothes"
+                    "name": "マルエツ",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Mango",
-                "icon": "clothing-store",
+                "name": "マルエツ",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Matalan": {
+            "shop/supermarket/Piggly Wiggly": {
                 "tags": {
                 "tags": {
-                    "name": "Matalan",
-                    "shop": "clothes"
+                    "name": "Piggly Wiggly",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Matalan",
-                "icon": "clothing-store",
+                "name": "Piggly Wiggly",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Mexx": {
+            "shop/supermarket/Crai": {
                 "tags": {
                 "tags": {
-                    "name": "Mexx",
-                    "shop": "clothes"
+                    "name": "Crai",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Mexx",
-                "icon": "clothing-store",
+                "name": "Crai",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Mr Price": {
+            "shop/supermarket/Biedronka": {
                 "tags": {
                 "tags": {
-                    "name": "Mr Price",
-                    "shop": "clothes"
+                    "name": "Biedronka",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Mr Price",
-                "icon": "clothing-store",
+                "name": "Biedronka",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/NKD": {
+            "shop/supermarket/El Árbol": {
                 "tags": {
                 "tags": {
-                    "name": "NKD",
-                    "shop": "clothes"
+                    "name": "El Árbol",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "NKD",
-                "icon": "clothing-store",
+                "name": "El Árbol",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/New Look": {
+            "shop/supermarket/Centre Commercial E. Leclerc": {
                 "tags": {
                 "tags": {
-                    "name": "New Look",
-                    "shop": "clothes"
+                    "name": "Centre Commercial E. Leclerc",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "New Look",
-                "icon": "clothing-store",
+                "name": "Centre Commercial E. Leclerc",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/New Yorker": {
+            "shop/supermarket/Foodland": {
                 "tags": {
                 "tags": {
-                    "name": "New Yorker",
-                    "shop": "clothes"
+                    "name": "Foodland",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "New Yorker",
-                "icon": "clothing-store",
+                "name": "Foodland",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Next": {
+            "shop/supermarket/Super Brugsen": {
                 "tags": {
                 "tags": {
-                    "name": "Next",
-                    "shop": "clothes"
+                    "name": "Super Brugsen",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Next",
-                "icon": "clothing-store",
+                "name": "Super Brugsen",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Old Navy": {
+            "shop/supermarket/Дикси": {
                 "tags": {
                 "tags": {
-                    "name": "Old Navy",
-                    "shop": "clothes"
+                    "name": "Дикси",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Old Navy",
-                "icon": "clothing-store",
+                "name": "Дикси",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Orsay": {
+            "shop/supermarket/Пятёрочка": {
                 "tags": {
                 "tags": {
-                    "name": "Orsay",
-                    "shop": "clothes"
+                    "name": "Пятёрочка",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Orsay",
-                "icon": "clothing-store",
+                "name": "Пятёрочка",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Peacocks": {
+            "shop/supermarket/Publix": {
                 "tags": {
                 "tags": {
-                    "name": "Peacocks",
-                    "shop": "clothes"
+                    "name": "Publix",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Peacocks",
-                "icon": "clothing-store",
+                "name": "Publix",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Pep": {
+            "shop/supermarket/Whole Foods": {
                 "tags": {
                 "tags": {
-                    "name": "Pep",
-                    "shop": "clothes"
+                    "name": "Whole Foods",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Pep",
-                "icon": "clothing-store",
+                "name": "Whole Foods",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Pimkie": {
+            "shop/supermarket/Føtex": {
                 "tags": {
                 "tags": {
-                    "name": "Pimkie",
-                    "shop": "clothes"
+                    "name": "Føtex",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Pimkie",
-                "icon": "clothing-store",
+                "name": "Føtex",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Primark": {
+            "shop/supermarket/coop": {
                 "tags": {
                 "tags": {
-                    "name": "Primark",
-                    "shop": "clothes"
+                    "name": "coop",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Primark",
-                "icon": "clothing-store",
+                "name": "coop",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Promod": {
+            "shop/supermarket/Fressnapf": {
                 "tags": {
                 "tags": {
-                    "name": "Promod",
-                    "shop": "clothes"
+                    "name": "Fressnapf",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Promod",
-                "icon": "clothing-store",
+                "name": "Fressnapf",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/River Island": {
+            "shop/supermarket/Coop Konsum": {
                 "tags": {
                 "tags": {
-                    "name": "River Island",
-                    "shop": "clothes"
+                    "name": "Coop Konsum",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "River Island",
-                "icon": "clothing-store",
+                "name": "Coop Konsum",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Ross": {
+            "shop/supermarket/Carrefour Contact": {
                 "tags": {
                 "tags": {
-                    "name": "Ross",
-                    "shop": "clothes"
+                    "name": "Carrefour Contact",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Ross",
-                "icon": "clothing-store",
+                "name": "Carrefour Contact",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Street One": {
+            "shop/supermarket/SPAR": {
                 "tags": {
                 "tags": {
-                    "name": "Street One",
-                    "shop": "clothes"
+                    "name": "SPAR",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Street One",
-                "icon": "clothing-store",
+                "name": "SPAR",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/TK Maxx": {
+            "shop/supermarket/No Frills": {
                 "tags": {
                 "tags": {
-                    "name": "TK Maxx",
-                    "shop": "clothes"
+                    "name": "No Frills",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "TK Maxx",
-                "icon": "clothing-store",
+                "name": "No Frills",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Takko": {
+            "shop/supermarket/The Co-operative Food": {
                 "tags": {
                 "tags": {
-                    "name": "Takko",
-                    "shop": "clothes"
+                    "name": "The Co-operative Food",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Takko",
-                "icon": "clothing-store",
+                "name": "The Co-operative Food",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Tally Weijl": {
+            "shop/supermarket/Plodine": {
                 "tags": {
                 "tags": {
-                    "name": "Tally Weijl",
-                    "shop": "clothes"
+                    "name": "Plodine",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Tally Weijl",
-                "icon": "clothing-store",
+                "name": "Plodine",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Tommy Hilfiger": {
+            "shop/supermarket/ADEG": {
                 "tags": {
                 "tags": {
-                    "name": "Tommy Hilfiger",
-                    "shop": "clothes"
+                    "name": "ADEG",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Tommy Hilfiger",
-                "icon": "clothing-store",
+                "name": "ADEG",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Truworths": {
+            "shop/supermarket/Minipreço": {
                 "tags": {
                 "tags": {
-                    "name": "Truworths",
-                    "shop": "clothes"
+                    "name": "Minipreço",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Truworths",
-                "icon": "clothing-store",
+                "name": "Minipreço",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Ulla Popken": {
+            "shop/supermarket/Eurospin": {
                 "tags": {
                 "tags": {
-                    "name": "Ulla Popken",
-                    "shop": "clothes"
+                    "name": "Eurospin",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Ulla Popken",
-                "icon": "clothing-store",
+                "name": "Eurospin",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/United Colors of Benetton": {
+            "shop/supermarket/Семья": {
                 "tags": {
                 "tags": {
-                    "name": "United Colors of Benetton",
-                    "shop": "clothes"
+                    "name": "Семья",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "United Colors of Benetton",
-                "icon": "clothing-store",
+                "name": "Семья",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Urban Outfitters": {
+            "shop/supermarket/Евроопт": {
                 "tags": {
                 "tags": {
-                    "name": "Urban Outfitters",
-                    "shop": "clothes"
+                    "name": "Евроопт",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Urban Outfitters",
-                "icon": "clothing-store",
+                "name": "Евроопт",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Vero Moda": {
+            "shop/supermarket/Centra": {
                 "tags": {
                 "tags": {
-                    "name": "Vero Moda",
-                    "shop": "clothes"
+                    "name": "Centra",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Vero Moda",
-                "icon": "clothing-store",
+                "name": "Centra",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Vögele": {
+            "shop/supermarket/Квартал": {
                 "tags": {
                 "tags": {
-                    "name": "Vögele",
-                    "shop": "clothes"
+                    "name": "Квартал",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Vögele",
-                "icon": "clothing-store",
+                "name": "Квартал",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Winners": {
+            "shop/supermarket/New World": {
                 "tags": {
                 "tags": {
-                    "name": "Winners",
-                    "shop": "clothes"
+                    "name": "New World",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Winners",
-                "icon": "clothing-store",
+                "name": "New World",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Woolworths": {
+            "shop/supermarket/Countdown": {
                 "tags": {
                 "tags": {
-                    "name": "Woolworths",
-                    "shop": "clothes"
+                    "name": "Countdown",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Woolworths",
-                "icon": "clothing-store",
+                "name": "Countdown",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Zara": {
+            "shop/supermarket/Reliance Fresh": {
                 "tags": {
                 "tags": {
-                    "name": "Zara",
-                    "shop": "clothes"
+                    "name": "Reliance Fresh",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Zara",
-                "icon": "clothing-store",
+                "name": "Reliance Fresh",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Zeeman": {
+            "shop/supermarket/Stokrotka": {
                 "tags": {
                 "tags": {
-                    "name": "Zeeman",
-                    "shop": "clothes"
+                    "name": "Stokrotka",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Zeeman",
-                "icon": "clothing-store",
+                "name": "Stokrotka",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/s.Oliver": {
+            "shop/supermarket/Coop Jednota": {
                 "tags": {
                 "tags": {
-                    "name": "s.Oliver",
-                    "shop": "clothes"
+                    "name": "Coop Jednota",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "s.Oliver",
-                "icon": "clothing-store",
+                "name": "Coop Jednota",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Одежда": {
+            "shop/supermarket/Fred Meyer": {
                 "tags": {
                 "tags": {
-                    "name": "Одежда",
-                    "shop": "clothes"
+                    "name": "Fred Meyer",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Одежда",
-                "icon": "clothing-store",
+                "name": "Fred Meyer",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/clothes/洋服の青山": {
+            "shop/supermarket/Irma": {
                 "tags": {
                 "tags": {
-                    "name": "洋服の青山",
-                    "shop": "clothes"
+                    "name": "Irma",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "洋服の青山",
-                "icon": "clothing-store",
+                "name": "Irma",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/computer/DNS": {
+            "shop/supermarket/Continente": {
                 "tags": {
                 "tags": {
-                    "name": "DNS",
-                    "shop": "computer"
+                    "name": "Continente",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "DNS",
-                "icon": "shop",
+                "name": "Continente",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/computer/PC World": {
+            "shop/supermarket/Price Chopper": {
                 "tags": {
                 "tags": {
-                    "name": "PC World",
-                    "shop": "computer"
+                    "name": "Price Chopper",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "PC World",
-                "icon": "shop",
+                "name": "Price Chopper",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/24 часа": {
+            "shop/supermarket/Wegmans": {
                 "tags": {
                 "tags": {
-                    "name": "24 часа",
-                    "shop": "convenience"
+                    "name": "Wegmans",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "24 часа",
-                "icon": "shop",
+                "name": "Wegmans",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/8 à Huit": {
+            "shop/supermarket/Game": {
                 "tags": {
                 "tags": {
-                    "name": "8 à Huit",
-                    "shop": "convenience"
+                    "name": "Game",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "8 à Huit",
-                "icon": "shop",
+                "name": "Game",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Alepa": {
+            "shop/supermarket/Soriana": {
                 "tags": {
                 "tags": {
-                    "name": "Alepa",
-                    "shop": "convenience"
+                    "name": "Soriana",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Alepa",
-                "icon": "shop",
+                "name": "Soriana",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Alfamart": {
+            "shop/supermarket/Alimerka": {
                 "tags": {
                 "tags": {
-                    "name": "Alfamart",
-                    "shop": "convenience"
+                    "name": "Alimerka",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Alfamart",
-                "icon": "shop",
+                "name": "Alimerka",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Almacen": {
+            "shop/supermarket/Piotr i Paweł": {
                 "tags": {
                 "tags": {
-                    "name": "Almacen",
-                    "shop": "convenience"
+                    "name": "Piotr i Paweł",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Almacen",
-                "icon": "shop",
+                "name": "Piotr i Paweł",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Biedronka": {
+            "shop/supermarket/Перекресток": {
                 "tags": {
                 "tags": {
-                    "name": "Biedronka",
-                    "shop": "convenience"
+                    "name": "Перекресток",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Biedronka",
-                "icon": "shop",
+                "name": "Перекресток",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/CBA": {
+            "shop/supermarket/Maxima X": {
                 "tags": {
                 "tags": {
-                    "name": "CBA",
-                    "shop": "convenience"
+                    "name": "Maxima X",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "CBA",
-                "icon": "shop",
+                "name": "Maxima X",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/COOP": {
+            "shop/supermarket/Карусель": {
                 "tags": {
                 "tags": {
-                    "name": "COOP",
-                    "shop": "convenience"
+                    "name": "Карусель",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "COOP",
-                "icon": "shop",
+                "name": "Карусель",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/COOP Jednota": {
+            "shop/supermarket/Tesco Lotus": {
                 "tags": {
                 "tags": {
-                    "name": "COOP Jednota",
-                    "shop": "convenience"
+                    "name": "Tesco Lotus",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "COOP Jednota",
-                "icon": "shop",
+                "name": "Tesco Lotus",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Carrefour City": {
+            "shop/supermarket/Condis": {
                 "tags": {
                 "tags": {
-                    "name": "Carrefour City",
-                    "shop": "convenience"
+                    "name": "Condis",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Carrefour City",
-                "icon": "shop",
+                "name": "Condis",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Carrefour Express": {
+            "shop/supermarket/Sam's Club": {
                 "tags": {
                 "tags": {
-                    "name": "Carrefour Express",
-                    "shop": "convenience"
+                    "name": "Sam's Club",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Carrefour Express",
-                "icon": "shop",
+                "name": "Sam's Club",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Casino": {
+            "shop/supermarket/Копейка": {
                 "tags": {
                 "tags": {
-                    "name": "Casino",
-                    "shop": "convenience"
+                    "name": "Копейка",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Casino",
-                "icon": "shop",
+                "name": "Копейка",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Centra": {
+            "shop/supermarket/Géant Casino": {
                 "tags": {
                 "tags": {
-                    "name": "Centra",
-                    "shop": "convenience"
+                    "name": "Géant Casino",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Centra",
-                "icon": "shop",
+                "name": "Géant Casino",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Central Convenience Store": {
+            "shop/supermarket/ASDA": {
                 "tags": {
                 "tags": {
-                    "name": "Central Convenience Store",
-                    "shop": "convenience"
+                    "name": "ASDA",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Central Convenience Store",
-                "icon": "shop",
+                "name": "ASDA",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Coop Jednota": {
+            "shop/supermarket/Intermarche": {
                 "tags": {
                 "tags": {
-                    "name": "Coop Jednota",
-                    "shop": "convenience"
+                    "name": "Intermarche",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Coop Jednota",
-                "icon": "shop",
+                "name": "Intermarche",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Costcutter": {
+            "shop/supermarket/Stop & Shop": {
                 "tags": {
                 "tags": {
-                    "name": "Costcutter",
-                    "shop": "convenience"
+                    "name": "Stop & Shop",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Costcutter",
-                "icon": "shop",
+                "name": "Stop & Shop",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Cumberland Farms": {
+            "shop/supermarket/Food Lion": {
                 "tags": {
                 "tags": {
-                    "name": "Cumberland Farms",
-                    "shop": "convenience"
+                    "name": "Food Lion",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Cumberland Farms",
-                "icon": "shop",
+                "name": "Food Lion",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Delikatesy": {
+            "shop/supermarket/Harris Teeter": {
                 "tags": {
                 "tags": {
-                    "name": "Delikatesy",
-                    "shop": "convenience"
+                    "name": "Harris Teeter",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Delikatesy",
-                "icon": "shop",
+                "name": "Harris Teeter",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Dollar General": {
+            "shop/supermarket/H-E-B": {
                 "tags": {
                 "tags": {
-                    "name": "Dollar General",
-                    "shop": "convenience"
+                    "name": "H-E-B",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Dollar General",
-                "icon": "shop",
+                "name": "H-E-B",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Dorfladen": {
+            "shop/supermarket/Foodworks": {
                 "tags": {
                 "tags": {
-                    "name": "Dorfladen",
-                    "shop": "convenience"
+                    "name": "Foodworks",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Dorfladen",
-                "icon": "shop",
+                "name": "Foodworks",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Epicerie": {
+            "shop/supermarket/Polo Market": {
                 "tags": {
                 "tags": {
-                    "name": "Epicerie",
-                    "shop": "convenience"
+                    "name": "Polo Market",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Epicerie",
-                "icon": "shop",
+                "name": "Polo Market",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/FamilyMart": {
+            "shop/supermarket/西友 (SEIYU)": {
                 "tags": {
                 "tags": {
-                    "name": "FamilyMart",
-                    "shop": "convenience"
+                    "name": "西友 (SEIYU)",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "FamilyMart",
-                "icon": "shop",
+                "name": "西友 (SEIYU)",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Food Mart": {
+            "shop/supermarket/Полушка": {
                 "tags": {
                 "tags": {
-                    "name": "Food Mart",
-                    "shop": "convenience"
+                    "name": "Полушка",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Food Mart",
-                "icon": "shop",
+                "name": "Полушка",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Four Square": {
+            "shop/supermarket/Extra": {
                 "tags": {
                 "tags": {
-                    "name": "Four Square",
-                    "shop": "convenience"
+                    "name": "Extra",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Four Square",
-                "icon": "shop",
+                "name": "Extra",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Franprix": {
+            "shop/supermarket/Lewiatan": {
                 "tags": {
                 "tags": {
-                    "name": "Franprix",
-                    "shop": "convenience"
+                    "name": "Lewiatan",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Franprix",
-                "icon": "shop",
+                "name": "Lewiatan",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Groszek": {
+            "shop/supermarket/АТБ": {
                 "tags": {
                 "tags": {
-                    "name": "Groszek",
-                    "shop": "convenience"
+                    "name": "АТБ",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Groszek",
-                "icon": "shop",
+                "name": "АТБ",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Hasty Market": {
+            "shop/supermarket/Społem": {
                 "tags": {
                 "tags": {
-                    "name": "Hasty Market",
-                    "shop": "convenience"
+                    "name": "Społem",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Hasty Market",
-                "icon": "shop",
+                "name": "Społem",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Indomaret": {
+            "shop/supermarket/Bodega Aurrera": {
                 "tags": {
                 "tags": {
-                    "name": "Indomaret",
-                    "shop": "convenience"
+                    "name": "Bodega Aurrera",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Indomaret",
-                "icon": "shop",
+                "name": "Bodega Aurrera",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Jednota": {
+            "shop/supermarket/Мария-Ра": {
                 "tags": {
                 "tags": {
-                    "name": "Jednota",
-                    "shop": "convenience"
+                    "name": "Мария-Ра",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Jednota",
-                "icon": "shop",
+                "name": "Мария-Ра",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/K-Market": {
+            "shop/supermarket/Магнолия": {
                 "tags": {
                 "tags": {
-                    "name": "K-Market",
-                    "shop": "convenience"
+                    "name": "Магнолия",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "K-Market",
-                "icon": "shop",
+                "name": "Магнолия",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Konzum": {
+            "shop/supermarket/Магазин": {
                 "tags": {
                 "tags": {
-                    "name": "Konzum",
-                    "shop": "convenience"
+                    "name": "Магазин",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Konzum",
-                "icon": "shop",
+                "name": "Магазин",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/LAWSON": {
+            "shop/supermarket/Монетка": {
                 "tags": {
                 "tags": {
-                    "name": "LAWSON",
-                    "shop": "convenience"
+                    "name": "Монетка",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "LAWSON",
-                "icon": "shop",
+                "name": "Монетка",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Lewiatan": {
+            "shop/supermarket/Hy-Vee": {
                 "tags": {
                 "tags": {
-                    "name": "Lewiatan",
-                    "shop": "convenience"
+                    "name": "Hy-Vee",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Lewiatan",
-                "icon": "shop",
+                "name": "Hy-Vee",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Londis": {
+            "shop/supermarket/Walmart Supercenter": {
                 "tags": {
                 "tags": {
-                    "name": "Londis",
-                    "shop": "convenience"
+                    "name": "Walmart Supercenter",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Londis",
-                "icon": "shop",
+                "name": "Walmart Supercenter",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mac's": {
+            "shop/supermarket/Hannaford": {
                 "tags": {
                 "tags": {
-                    "name": "Mac's",
-                    "shop": "convenience"
+                    "name": "Hannaford",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Mac's",
-                "icon": "shop",
+                "name": "Hannaford",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mace": {
+            "shop/supermarket/業務スーパー": {
                 "tags": {
                 "tags": {
-                    "name": "Mace",
-                    "shop": "convenience"
+                    "name": "業務スーパー",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Mace",
-                "icon": "shop",
+                "name": "業務スーパー",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/McColl's": {
+            "shop/supermarket/Norfa XL": {
                 "tags": {
                 "tags": {
-                    "name": "McColl's",
-                    "shop": "convenience"
+                    "name": "Norfa XL",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "McColl's",
-                "icon": "shop",
+                "name": "Norfa XL",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mercator": {
+            "shop/supermarket/ヨークマート (YorkMart)": {
                 "tags": {
                 "tags": {
-                    "name": "Mercator",
-                    "shop": "convenience"
+                    "name": "ヨークマート (YorkMart)",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Mercator",
-                "icon": "shop",
+                "name": "ヨークマート (YorkMart)",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mini Market": {
+            "shop/supermarket/Leclerc Drive": {
                 "tags": {
                 "tags": {
-                    "name": "Mini Market",
-                    "shop": "convenience"
+                    "name": "Leclerc Drive",
+                    "shop": "supermarket"
                 },
                 },
-                "name": "Mini Market",
-                "icon": "shop",
+                "name": "Leclerc Drive",
+                "icon": "grocery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mini Stop": {
+            "shop/electronics/Media Markt": {
                 "tags": {
                 "tags": {
-                    "name": "Mini Stop",
-                    "shop": "convenience"
+                    "name": "Media Markt",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Mini Stop",
+                "name": "Media Markt",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85756,12 +89670,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Nisa": {
+            "shop/electronics/Maplin": {
                 "tags": {
                 "tags": {
-                    "name": "Nisa",
-                    "shop": "convenience"
+                    "name": "Maplin",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Nisa",
+                "name": "Maplin",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85775,12 +89689,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Nisa Local": {
+            "shop/electronics/Best Buy": {
                 "tags": {
                 "tags": {
-                    "name": "Nisa Local",
-                    "shop": "convenience"
+                    "name": "Best Buy",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Nisa Local",
+                "name": "Best Buy",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85794,12 +89708,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Oxxo": {
+            "shop/electronics/Future Shop": {
                 "tags": {
                 "tags": {
-                    "name": "Oxxo",
-                    "shop": "convenience"
+                    "name": "Future Shop",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Oxxo",
+                "name": "Future Shop",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85813,12 +89727,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/One Stop": {
+            "shop/electronics/Saturn": {
                 "tags": {
                 "tags": {
-                    "name": "One Stop",
-                    "shop": "convenience"
+                    "name": "Saturn",
+                    "shop": "electronics"
                 },
                 },
-                "name": "One Stop",
+                "name": "Saturn",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85832,12 +89746,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Petit Casino": {
+            "shop/electronics/Currys": {
                 "tags": {
                 "tags": {
-                    "name": "Petit Casino",
-                    "shop": "convenience"
+                    "name": "Currys",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Petit Casino",
+                "name": "Currys",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85851,12 +89765,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Picard": {
+            "shop/electronics/Radio Shack": {
                 "tags": {
                 "tags": {
-                    "name": "Picard",
-                    "shop": "convenience"
+                    "name": "Radio Shack",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Picard",
+                "name": "Radio Shack",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85870,12 +89784,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Potraviny": {
+            "shop/electronics/Comet": {
                 "tags": {
                 "tags": {
-                    "name": "Potraviny",
-                    "shop": "convenience"
+                    "name": "Comet",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Potraviny",
+                "name": "Comet",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85889,12 +89803,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Premier": {
+            "shop/electronics/Euronics": {
                 "tags": {
                 "tags": {
-                    "name": "Premier",
-                    "shop": "convenience"
+                    "name": "Euronics",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Premier",
+                "name": "Euronics",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85908,12 +89822,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Proxi": {
+            "shop/electronics/Expert": {
                 "tags": {
                 "tags": {
-                    "name": "Proxi",
-                    "shop": "convenience"
+                    "name": "Expert",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Proxi",
+                "name": "Expert",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85927,12 +89841,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/SPAR": {
+            "shop/electronics/Эльдорадо": {
                 "tags": {
                 "tags": {
-                    "name": "SPAR",
-                    "shop": "convenience"
+                    "name": "Эльдорадо",
+                    "shop": "electronics"
                 },
                 },
-                "name": "SPAR",
+                "name": "Эльдорадо",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85946,12 +89860,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Sainsbury's Local": {
+            "shop/electronics/Darty": {
                 "tags": {
                 "tags": {
-                    "name": "Sainsbury's Local",
-                    "shop": "convenience"
+                    "name": "Darty",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Sainsbury's Local",
+                "name": "Darty",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85965,12 +89879,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Sale": {
+            "shop/electronics/М.Видео": {
                 "tags": {
                 "tags": {
-                    "name": "Sale",
-                    "shop": "convenience"
+                    "name": "М.Видео",
+                    "shop": "electronics"
                 },
                 },
-                "name": "Sale",
+                "name": "М.Видео",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -85984,12 +89898,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Select": {
+            "shop/convenience/McColl's": {
                 "tags": {
                 "tags": {
-                    "name": "Select",
+                    "name": "McColl's",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Select",
+                "name": "McColl's",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86003,12 +89917,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Siwa": {
+            "shop/convenience/One Stop": {
                 "tags": {
                 "tags": {
-                    "name": "Siwa",
+                    "name": "One Stop",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Siwa",
+                "name": "One Stop",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86022,12 +89936,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Sklep spożywczy": {
+            "shop/convenience/Londis": {
                 "tags": {
                 "tags": {
-                    "name": "Sklep spożywczy",
+                    "name": "Londis",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Sklep spożywczy",
+                "name": "Londis",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86041,12 +89955,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Spar": {
+            "shop/convenience/Sale": {
                 "tags": {
                 "tags": {
-                    "name": "Spar",
+                    "name": "Sale",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Spar",
+                "name": "Sale",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86060,12 +89974,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Społem": {
+            "shop/convenience/Siwa": {
                 "tags": {
                 "tags": {
-                    "name": "Społem",
+                    "name": "Siwa",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Społem",
+                "name": "Siwa",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86079,12 +89993,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Spożywczy": {
+            "shop/convenience/Mac's": {
                 "tags": {
                 "tags": {
-                    "name": "Spożywczy",
+                    "name": "Mac's",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Spożywczy",
+                "name": "Mac's",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86098,12 +90012,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Stores": {
+            "shop/convenience/Alepa": {
                 "tags": {
                 "tags": {
-                    "name": "Stores",
+                    "name": "Alepa",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Stores",
+                "name": "Alepa",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86117,12 +90031,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Studenac": {
+            "shop/convenience/Hasty Market": {
                 "tags": {
                 "tags": {
-                    "name": "Studenac",
+                    "name": "Hasty Market",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Studenac",
+                "name": "Hasty Market",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86136,12 +90050,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Sunkus": {
+            "shop/convenience/K-Market": {
                 "tags": {
                 "tags": {
-                    "name": "Sunkus",
+                    "name": "K-Market",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Sunkus",
+                "name": "K-Market",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86155,12 +90069,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Tesco Express": {
+            "shop/convenience/Valintatalo": {
                 "tags": {
                 "tags": {
-                    "name": "Tesco Express",
+                    "name": "Valintatalo",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Tesco Express",
+                "name": "Valintatalo",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86174,12 +90088,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/The Co-operative Food": {
+            "shop/convenience/セブンイレブン": {
                 "tags": {
                 "tags": {
-                    "name": "The Co-operative Food",
+                    "name": "セブンイレブン",
+                    "name:en": "7-Eleven",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "The Co-operative Food",
+                "name": "セブンイレブン",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86193,12 +90108,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Valintatalo": {
+            "shop/convenience/ローソン": {
                 "tags": {
                 "tags": {
-                    "name": "Valintatalo",
+                    "name": "ローソン",
+                    "name:en": "LAWSON",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Valintatalo",
+                "name": "ローソン",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86212,12 +90128,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Vival": {
+            "shop/convenience/Mace": {
                 "tags": {
                 "tags": {
-                    "name": "Vival",
+                    "name": "Mace",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Vival",
+                "name": "Mace",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86231,12 +90147,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Volg": {
+            "shop/convenience/Mini Market": {
                 "tags": {
                 "tags": {
-                    "name": "Volg",
+                    "name": "Mini Market",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Volg",
+                "name": "Mini Market",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86250,12 +90166,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/abc": {
+            "shop/convenience/Nisa Local": {
                 "tags": {
                 "tags": {
-                    "name": "abc",
+                    "name": "Nisa Local",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "abc",
+                "name": "Nisa Local",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86269,12 +90185,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Żabka": {
+            "shop/convenience/Dorfladen": {
                 "tags": {
                 "tags": {
-                    "name": "Żabka",
+                    "name": "Dorfladen",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Żabka",
+                "name": "Dorfladen",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86288,12 +90204,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Ð\90воÑ\81Ñ\8cка": {
+            "shop/convenience/Ð\9fÑ\80одÑ\83кÑ\82Ñ\8b": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\90воÑ\81Ñ\8cка",
+                    "name": "Ð\9fÑ\80одÑ\83кÑ\82Ñ\8b",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Ð\90воÑ\81Ñ\8cка",
+                "name": "Ð\9fÑ\80одÑ\83кÑ\82Ñ\8b",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86307,12 +90223,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Березка": {
+            "shop/convenience/Mini Stop": {
                 "tags": {
                 "tags": {
-                    "name": "Березка",
+                    "name": "Mini Stop",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Березка",
+                "name": "Mini Stop",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86326,12 +90242,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Весна": {
+            "shop/convenience/LAWSON": {
                 "tags": {
                 "tags": {
-                    "name": "Весна",
+                    "name": "LAWSON",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Весна",
+                "name": "LAWSON",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86345,12 +90261,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Визит": {
+            "shop/convenience/デイリーヤマザキ": {
                 "tags": {
                 "tags": {
-                    "name": "Визит",
+                    "name": "デイリーヤマザキ",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Визит",
+                "name": "デイリーヤマザキ",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86364,12 +90280,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Ð\92икÑ\82оÑ\80иÑ\8f": {
+            "shop/convenience/Ð\9dадежда": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\92икÑ\82оÑ\80иÑ\8f",
+                    "name": "Ð\9dадежда",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Ð\92икÑ\82оÑ\80иÑ\8f",
+                "name": "Ð\9dадежда",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86383,12 +90299,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Гастроном": {
+            "shop/convenience/Nisa": {
                 "tags": {
                 "tags": {
-                    "name": "Гастроном",
+                    "name": "Nisa",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Гастроном",
+                "name": "Nisa",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86402,12 +90318,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Дикси": {
+            "shop/convenience/Premier": {
                 "tags": {
                 "tags": {
-                    "name": "Дикси",
+                    "name": "Premier",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Дикси",
+                "name": "Premier",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86421,12 +90337,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Кировский": {
+            "shop/convenience/ミニストップ": {
                 "tags": {
                 "tags": {
-                    "name": "Кировский",
+                    "name": "ミニストップ",
+                    "name:en": "MINISTOP",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Кировский",
+                "name": "ミニストップ",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86440,12 +90357,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Копеечка": {
+            "shop/convenience/サンクス": {
                 "tags": {
                 "tags": {
-                    "name": "Копеечка",
+                    "name": "サンクス",
+                    "name:en": "sunkus",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Копеечка",
+                "name": "サンクス",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86459,12 +90377,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Кулинария": {
+            "shop/convenience/スリーエフ": {
                 "tags": {
                 "tags": {
-                    "name": "Кулинария",
+                    "name": "スリーエフ",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Кулинария",
+                "name": "スリーエフ",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86478,12 +90396,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Магазин": {
+            "shop/convenience/8 à Huit": {
                 "tags": {
                 "tags": {
-                    "name": "Магазин",
+                    "name": "8 à Huit",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Магазин",
+                "name": "8 à Huit",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86497,12 +90415,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Магнит": {
+            "shop/convenience/Żabka": {
                 "tags": {
                 "tags": {
-                    "name": "Магнит",
+                    "name": "Żabka",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Магнит",
+                "name": "Żabka",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86516,12 +90434,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Мария-Ра": {
+            "shop/convenience/Almacen": {
                 "tags": {
                 "tags": {
-                    "name": "Мария-Ра",
+                    "name": "Almacen",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Мария-Ра",
+                "name": "Almacen",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86535,12 +90453,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Мечта": {
+            "shop/convenience/Vival": {
                 "tags": {
                 "tags": {
-                    "name": "Мечта",
+                    "name": "Vival",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Мечта",
+                "name": "Vival",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86554,12 +90472,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Минимаркет": {
+            "shop/convenience/FamilyMart": {
                 "tags": {
                 "tags": {
-                    "name": "Минимаркет",
+                    "name": "FamilyMart",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Минимаркет",
+                "name": "FamilyMart",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86573,12 +90491,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Монетка": {
+            "shop/convenience/ファミリーマート": {
                 "tags": {
                 "tags": {
-                    "name": "Монетка",
+                    "name": "ファミリーマート",
+                    "name:en": "FamilyMart",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Монетка",
+                "name": "ファミリーマート",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86592,12 +90511,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Надежда": {
+            "shop/convenience/Sunkus": {
                 "tags": {
                 "tags": {
-                    "name": "Надежда",
+                    "name": "Sunkus",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Надежда",
+                "name": "Sunkus",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86611,12 +90530,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Перекресток": {
+            "shop/convenience/セブンイレブン(Seven-Eleven)": {
                 "tags": {
                 "tags": {
-                    "name": "Перекресток",
+                    "name": "セブンイレブン(Seven-Eleven)",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Перекресток",
+                "name": "セブンイレブン(Seven-Eleven)",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86630,12 +90549,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Продукти": {
+            "shop/convenience/Jednota": {
                 "tags": {
                 "tags": {
-                    "name": "Продукти",
+                    "name": "Jednota",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Продукти",
+                "name": "Jednota",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86649,12 +90568,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Ð\9fÑ\80одÑ\83кÑ\82овÑ\8bй": {
+            "shop/convenience/Ð\93аÑ\81Ñ\82Ñ\80оном": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\9fÑ\80одÑ\83кÑ\82овÑ\8bй",
+                    "name": "Ð\93аÑ\81Ñ\82Ñ\80оном",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Ð\9fÑ\80одÑ\83кÑ\82овÑ\8bй",
+                "name": "Ð\93аÑ\81Ñ\82Ñ\80оном",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86668,12 +90587,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Продуктовый магазин": {
+            "shop/convenience/Sklep spożywczy": {
                 "tags": {
                 "tags": {
-                    "name": "Продуктовый магазин",
+                    "name": "Sklep spożywczy",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Продуктовый магазин",
+                "name": "Sklep spożywczy",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86687,12 +90606,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Продукты": {
+            "shop/convenience/サークルK": {
                 "tags": {
                 "tags": {
-                    "name": "Продукты",
+                    "name": "サークルK",
+                    "name:en": "Circle K",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Продукты",
+                "name": "サークルK",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86706,12 +90626,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Пятёрочка": {
+            "shop/convenience/Proxi": {
                 "tags": {
                 "tags": {
-                    "name": "Пятёрочка",
+                    "name": "Proxi",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Пятёрочка",
+                "name": "Proxi",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86725,12 +90645,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Смак": {
+            "shop/convenience/УнивеÑ\80Ñ\81ам": {
                 "tags": {
                 "tags": {
-                    "name": "Смак",
+                    "name": "УнивеÑ\80Ñ\81ам",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Смак",
+                "name": "УнивеÑ\80Ñ\81ам",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86744,12 +90664,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Универсам": {
+            "shop/convenience/Groszek": {
                 "tags": {
                 "tags": {
-                    "name": "Универсам",
+                    "name": "Groszek",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "Универсам",
+                "name": "Groszek",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86763,12 +90683,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/магазин": {
+            "shop/convenience/Select": {
                 "tags": {
                 "tags": {
-                    "name": "магазин",
+                    "name": "Select",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "магазин",
+                "name": "Select",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86782,12 +90702,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/продукты": {
+            "shop/convenience/Potraviny": {
                 "tags": {
                 "tags": {
-                    "name": "продукты",
+                    "name": "Potraviny",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "продукты",
+                "name": "Potraviny",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86801,12 +90721,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/เซเว่นอีเลฟเว่น": {
+            "shop/convenience/Смак": {
                 "tags": {
                 "tags": {
-                    "name": "เซเว่นอีเลฟเว่น",
+                    "name": "Смак",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "เซเว่นอีเลฟเว่น",
+                "name": "Смак",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86820,12 +90740,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/მარკეტი (Market)": {
+            "shop/convenience/Эконом": {
                 "tags": {
                 "tags": {
-                    "name": "მარკეტი (Market)",
+                    "name": "Эконом",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "მარკეტი (Market)",
+                "name": "Эконом",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86839,13 +90759,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/サンクス": {
+            "shop/convenience/Березка": {
                 "tags": {
                 "tags": {
-                    "name": "サンクス",
-                    "name:en": "sunkus",
+                    "name": "Березка",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "サンクス",
+                "name": "Березка",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86859,13 +90778,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/サークルK": {
+            "shop/convenience/Cumberland Farms": {
                 "tags": {
                 "tags": {
-                    "name": "サークルK",
-                    "name:en": "Circle K",
+                    "name": "Cumberland Farms",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "サークルK",
+                "name": "Cumberland Farms",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86879,12 +90797,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/スリーエフ": {
+            "shop/convenience/Tesco Lotus Express": {
                 "tags": {
                 "tags": {
-                    "name": "スリーエフ",
+                    "name": "Tesco Lotus Express",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "スリーエフ",
+                "name": "Tesco Lotus Express",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86898,12 +90816,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/セイコーマート (Seicomart)": {
+            "shop/convenience/24 часа": {
                 "tags": {
                 "tags": {
-                    "name": "セイコーマート (Seicomart)",
+                    "name": "24 часа",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "セイコーマート (Seicomart)",
+                "name": "24 часа",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86917,13 +90835,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/セブンイレブン": {
+            "shop/convenience/Минимаркет": {
                 "tags": {
                 "tags": {
-                    "name": "セブンイレブン",
-                    "name:en": "7-Eleven",
+                    "name": "Минимаркет",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "セブンイレブン",
+                "name": "Минимаркет",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86937,12 +90854,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/デイリーヤマザキ": {
+            "shop/convenience/Oxxo": {
                 "tags": {
                 "tags": {
-                    "name": "デイリーヤマザキ",
+                    "name": "Oxxo",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "デイリーヤマザキ",
+                "name": "Oxxo",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86956,13 +90873,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ファミリーマート": {
+            "shop/convenience/abc": {
                 "tags": {
                 "tags": {
-                    "name": "ファミリーマート",
-                    "name:en": "FamilyMart",
+                    "name": "abc",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "ファミリーマート",
+                "name": "abc",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86976,13 +90892,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ミニストップ": {
+            "shop/convenience/Продукти": {
                 "tags": {
                 "tags": {
-                    "name": "ミニストップ",
-                    "name:en": "MINISTOP",
+                    "name": "Продукти",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "ミニストップ",
+                "name": "Продукти",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -86996,13 +90911,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ローソン": {
+            "shop/convenience/ローソンストア100 (LAWSON STORE 100)": {
                 "tags": {
                 "tags": {
-                    "name": "ローソン",
-                    "name:en": "LAWSON",
+                    "name": "ローソンストア100 (LAWSON STORE 100)",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "ローソン",
+                "name": "ローソンストア100 (LAWSON STORE 100)",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87035,12 +90949,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ローソンストア100 (LAWSON STORE 100)": {
+            "shop/convenience/เซเว่นอีเลฟเว่น": {
                 "tags": {
                 "tags": {
-                    "name": "ローソンストア100 (LAWSON STORE 100)",
+                    "name": "เซเว่นอีเลฟเว่น",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "ローソンストア100 (LAWSON STORE 100)",
+                "name": "เซเว่นอีเลฟเว่น",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87054,12 +90968,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/全家": {
+            "shop/convenience/Spożywczy": {
                 "tags": {
                 "tags": {
-                    "name": "全家",
+                    "name": "Spożywczy",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "全家",
+                "name": "Spożywczy",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87073,12 +90987,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/convenience/全家便利商店": {
+            "shop/convenience/Фортуна": {
                 "tags": {
                 "tags": {
-                    "name": "全家便利商店",
+                    "name": "Фортуна",
                     "shop": "convenience"
                 },
                     "shop": "convenience"
                 },
-                "name": "全家便利商店",
+                "name": "Фортуна",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87092,12 +91006,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Big W": {
+            "shop/convenience/Picard": {
                 "tags": {
                 "tags": {
-                    "name": "Big W",
-                    "shop": "department_store"
+                    "name": "Picard",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Big W",
+                "name": "Picard",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87111,12 +91025,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Debenhams": {
+            "shop/convenience/Four Square": {
                 "tags": {
                 "tags": {
-                    "name": "Debenhams",
-                    "shop": "department_store"
+                    "name": "Four Square",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Debenhams",
+                "name": "Four Square",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87130,12 +91044,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Galeria Kaufhof": {
+            "shop/convenience/Визит": {
                 "tags": {
                 "tags": {
-                    "name": "Galeria Kaufhof",
-                    "shop": "department_store"
+                    "name": "Визит",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Galeria Kaufhof",
+                "name": "Визит",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87149,12 +91063,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Karstadt": {
+            "shop/convenience/Авоська": {
                 "tags": {
                 "tags": {
-                    "name": "Karstadt",
-                    "shop": "department_store"
+                    "name": "Авоська",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Karstadt",
+                "name": "Авоська",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87168,12 +91082,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Kmart": {
+            "shop/convenience/Dollar General": {
                 "tags": {
                 "tags": {
-                    "name": "Kmart",
-                    "shop": "department_store"
+                    "name": "Dollar General",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Kmart",
+                "name": "Dollar General",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87187,12 +91101,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Kohl's": {
+            "shop/convenience/Studenac": {
                 "tags": {
                 "tags": {
-                    "name": "Kohl's",
-                    "shop": "department_store"
+                    "name": "Studenac",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Kohl's",
+                "name": "Studenac",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87206,12 +91120,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Macy's": {
+            "shop/convenience/Central Convenience Store": {
                 "tags": {
                 "tags": {
-                    "name": "Macy's",
-                    "shop": "department_store"
+                    "name": "Central Convenience Store",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Macy's",
+                "name": "Central Convenience Store",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87225,12 +91139,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Marks & Spencer": {
+            "shop/convenience/продукты": {
                 "tags": {
                 "tags": {
-                    "name": "Marks & Spencer",
-                    "shop": "department_store"
+                    "name": "продукты",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Marks & Spencer",
+                "name": "продукты",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87244,12 +91158,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Sears": {
+            "shop/convenience/Кулинария": {
                 "tags": {
                 "tags": {
-                    "name": "Sears",
-                    "shop": "department_store"
+                    "name": "Кулинария",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Sears",
+                "name": "Кулинария",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87263,12 +91177,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Target": {
+            "shop/convenience/全家": {
                 "tags": {
                 "tags": {
-                    "name": "Target",
-                    "shop": "department_store"
+                    "name": "全家",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Target",
+                "name": "全家",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87282,12 +91196,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Walmart": {
+            "shop/convenience/Мечта": {
                 "tags": {
                 "tags": {
-                    "name": "Walmart",
-                    "shop": "department_store"
+                    "name": "Мечта",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Walmart",
+                "name": "Мечта",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87301,12 +91215,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Walmart Supercenter": {
+            "shop/convenience/Epicerie": {
                 "tags": {
                 "tags": {
-                    "name": "Walmart Supercenter",
-                    "shop": "department_store"
+                    "name": "Epicerie",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Walmart Supercenter",
+                "name": "Epicerie",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87320,12 +91234,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Woolworth": {
+            "shop/convenience/Кировский": {
                 "tags": {
                 "tags": {
-                    "name": "Woolworth",
-                    "shop": "department_store"
+                    "name": "Кировский",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Woolworth",
+                "name": "Кировский",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87339,12 +91253,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/department_store/Универмаг": {
+            "shop/convenience/Food Mart": {
                 "tags": {
                 "tags": {
-                    "name": "Универмаг",
-                    "shop": "department_store"
+                    "name": "Food Mart",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Универмаг",
+                "name": "Food Mart",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87358,12 +91272,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Ace Hardware": {
+            "shop/convenience/Delikatesy": {
                 "tags": {
                 "tags": {
-                    "name": "Ace Hardware",
-                    "shop": "doityourself"
+                    "name": "Delikatesy",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Ace Hardware",
+                "name": "Delikatesy",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87377,12 +91291,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/B&Q": {
+            "shop/convenience/ポプラ": {
                 "tags": {
                 "tags": {
-                    "name": "B&Q",
-                    "shop": "doityourself"
+                    "name": "ポプラ",
+                    "shop": "convenience"
                 },
                 },
-                "name": "B&Q",
+                "name": "ポプラ",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87396,12 +91310,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Bauhaus": {
+            "shop/convenience/Продуктовый магазин": {
                 "tags": {
                 "tags": {
-                    "name": "Bauhaus",
-                    "shop": "doityourself"
+                    "name": "Продуктовый магазин",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Bauhaus",
+                "name": "Продуктовый магазин",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87415,12 +91329,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Baumax": {
+            "shop/convenience/Продуктовый": {
                 "tags": {
                 "tags": {
-                    "name": "Baumax",
-                    "shop": "doityourself"
+                    "name": "Продуктовый",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Baumax",
+                "name": "Продуктовый",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87434,12 +91348,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Brico": {
+            "shop/convenience/セイコーマート (Seicomart)": {
                 "tags": {
                 "tags": {
-                    "name": "Brico",
-                    "shop": "doityourself"
+                    "name": "セイコーマート (Seicomart)",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Brico",
+                "name": "セイコーマート (Seicomart)",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87453,12 +91367,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Bricomarché": {
+            "shop/convenience/Виктория": {
                 "tags": {
                 "tags": {
-                    "name": "Bricomarché",
-                    "shop": "doityourself"
+                    "name": "Виктория",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Bricomarché",
+                "name": "Виктория",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87472,12 +91386,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Bricorama": {
+            "shop/convenience/Весна": {
                 "tags": {
                 "tags": {
-                    "name": "Bricorama",
-                    "shop": "doityourself"
+                    "name": "Весна",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Bricorama",
+                "name": "Весна",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87491,12 +91405,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Bunnings Warehouse": {
+            "shop/convenience/Mini Market Non-Stop": {
                 "tags": {
                 "tags": {
-                    "name": "Bunnings Warehouse",
-                    "shop": "doityourself"
+                    "name": "Mini Market Non-Stop",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Bunnings Warehouse",
+                "name": "Mini Market Non-Stop",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87510,12 +91424,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Castorama": {
+            "shop/convenience/Копеечка": {
                 "tags": {
                 "tags": {
-                    "name": "Castorama",
-                    "shop": "doityourself"
+                    "name": "Копеечка",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Castorama",
+                "name": "Копеечка",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87529,12 +91443,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Gamma": {
+            "shop/convenience/Royal Farms": {
                 "tags": {
                 "tags": {
-                    "name": "Gamma",
-                    "shop": "doityourself"
+                    "name": "Royal Farms",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Gamma",
+                "name": "Royal Farms",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87548,12 +91462,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Hagebau": {
+            "shop/convenience/Alfamart": {
                 "tags": {
                 "tags": {
-                    "name": "Hagebau",
-                    "shop": "doityourself"
+                    "name": "Alfamart",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Hagebau",
+                "name": "Alfamart",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87567,12 +91481,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Hagebaumarkt": {
+            "shop/convenience/Indomaret": {
                 "tags": {
                 "tags": {
-                    "name": "Hagebaumarkt",
-                    "shop": "doityourself"
+                    "name": "Indomaret",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Hagebaumarkt",
+                "name": "Indomaret",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87586,12 +91500,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Hellweg": {
+            "shop/convenience/магазин": {
                 "tags": {
                 "tags": {
-                    "name": "Hellweg",
-                    "shop": "doityourself"
+                    "name": "магазин",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Hellweg",
+                "name": "магазин",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87605,12 +91519,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Home Depot": {
+            "shop/convenience/全家便利商店": {
                 "tags": {
                 "tags": {
-                    "name": "Home Depot",
-                    "shop": "doityourself"
+                    "name": "全家便利商店",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Home Depot",
+                "name": "全家便利商店",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87624,12 +91538,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Home Hardware": {
+            "shop/convenience/მარკეტი (Market)": {
                 "tags": {
                 "tags": {
-                    "name": "Home Hardware",
-                    "shop": "doityourself"
+                    "name": "მარკეტი (Market)",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Home Hardware",
+                "name": "მარკეტი (Market)",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87643,12 +91557,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Homebase": {
+            "shop/convenience/Stores": {
                 "tags": {
                 "tags": {
-                    "name": "Homebase",
-                    "shop": "doityourself"
+                    "name": "Stores",
+                    "shop": "convenience"
                 },
                 },
-                "name": "Homebase",
+                "name": "Stores",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87662,12 +91576,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Hornbach": {
+            "shop/chemist/Müller": {
                 "tags": {
                 "tags": {
-                    "name": "Hornbach",
-                    "shop": "doityourself"
+                    "name": "Müller",
+                    "shop": "chemist"
                 },
                 },
-                "name": "Hornbach",
+                "name": "Müller",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87681,12 +91595,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Hubo": {
+            "shop/chemist/Schlecker": {
                 "tags": {
                 "tags": {
-                    "name": "Hubo",
-                    "shop": "doityourself"
+                    "name": "Schlecker",
+                    "shop": "chemist"
                 },
                 },
-                "name": "Hubo",
+                "name": "Schlecker",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87700,12 +91614,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Lagerhaus": {
+            "shop/chemist/Etos": {
                 "tags": {
                 "tags": {
-                    "name": "Lagerhaus",
-                    "shop": "doityourself"
+                    "name": "Etos",
+                    "shop": "chemist"
                 },
                 },
-                "name": "Lagerhaus",
+                "name": "Etos",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87719,12 +91633,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Leroy Merlin": {
+            "shop/chemist/Bipa": {
                 "tags": {
                 "tags": {
-                    "name": "Leroy Merlin",
-                    "shop": "doityourself"
+                    "name": "Bipa",
+                    "shop": "chemist"
                 },
                 },
-                "name": "Leroy Merlin",
+                "name": "Bipa",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87738,12 +91652,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Lowes": {
+            "shop/chemist/Rossmann": {
                 "tags": {
                 "tags": {
-                    "name": "Lowes",
-                    "shop": "doityourself"
+                    "name": "Rossmann",
+                    "shop": "chemist"
                 },
                 },
-                "name": "Lowes",
+                "name": "Rossmann",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87757,12 +91671,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Max Bahr": {
+            "shop/chemist/Ihr Platz": {
                 "tags": {
                 "tags": {
-                    "name": "Max Bahr",
-                    "shop": "doityourself"
+                    "name": "Ihr Platz",
+                    "shop": "chemist"
                 },
                 },
-                "name": "Max Bahr",
+                "name": "Ihr Platz",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87776,12 +91690,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Menards": {
+            "shop/chemist/Douglas": {
                 "tags": {
                 "tags": {
-                    "name": "Menards",
-                    "shop": "doityourself"
+                    "name": "Douglas",
+                    "shop": "chemist"
                 },
                 },
-                "name": "Menards",
+                "name": "Douglas",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87795,12 +91709,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Mr Bricolage": {
+            "shop/chemist/Kruidvat": {
                 "tags": {
                 "tags": {
-                    "name": "Mr Bricolage",
-                    "shop": "doityourself"
+                    "name": "Kruidvat",
+                    "shop": "chemist"
                 },
                 },
-                "name": "Mr Bricolage",
+                "name": "Kruidvat",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87814,12 +91728,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/OBI": {
+            "shop/car_repair/Peugeot": {
                 "tags": {
                 "tags": {
-                    "name": "OBI",
-                    "shop": "doityourself"
+                    "name": "Peugeot",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "OBI",
+                "name": "Peugeot",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87833,12 +91747,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Praktiker": {
+            "shop/car_repair/Kwik Fit": {
                 "tags": {
                 "tags": {
-                    "name": "Praktiker",
-                    "shop": "doityourself"
+                    "name": "Kwik Fit",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Praktiker",
+                "name": "Kwik Fit",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87852,12 +91766,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Rona": {
+            "shop/car_repair/ATU": {
                 "tags": {
                 "tags": {
-                    "name": "Rona",
-                    "shop": "doityourself"
+                    "name": "ATU",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Rona",
+                "name": "ATU",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87871,12 +91785,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Toom": {
+            "shop/car_repair/Kwik-Fit": {
                 "tags": {
                 "tags": {
-                    "name": "Toom",
-                    "shop": "doityourself"
+                    "name": "Kwik-Fit",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Toom",
+                "name": "Kwik-Fit",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87890,12 +91804,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Toom Baumarkt": {
+            "shop/car_repair/Midas": {
                 "tags": {
                 "tags": {
-                    "name": "Toom Baumarkt",
-                    "shop": "doityourself"
+                    "name": "Midas",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Toom Baumarkt",
+                "name": "Midas",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87909,12 +91823,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Weldom": {
+            "shop/car_repair/Feu Vert": {
                 "tags": {
                 "tags": {
-                    "name": "Weldom",
-                    "shop": "doityourself"
+                    "name": "Feu Vert",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Weldom",
+                "name": "Feu Vert",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87928,12 +91842,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Wickes": {
+            "shop/car_repair/Norauto": {
                 "tags": {
                 "tags": {
-                    "name": "Wickes",
-                    "shop": "doityourself"
+                    "name": "Norauto",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Wickes",
+                "name": "Norauto",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87947,12 +91861,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Стройматериалы": {
+            "shop/car_repair/Speedy": {
                 "tags": {
                 "tags": {
-                    "name": "Стройматериалы",
-                    "shop": "doityourself"
+                    "name": "Speedy",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Стройматериалы",
+                "name": "Speedy",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87966,12 +91880,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Хозтовары": {
+            "shop/car_repair/Автозапчасти": {
                 "tags": {
                 "tags": {
-                    "name": "ХозÑ\82оваÑ\80Ñ\8b",
-                    "shop": "doityourself"
+                    "name": "Ð\90вÑ\82озапÑ\87аÑ\81Ñ\82и",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "ХозÑ\82оваÑ\80Ñ\8b",
+                "name": "Ð\90вÑ\82озапÑ\87аÑ\81Ñ\82и",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -87985,12 +91899,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Best Buy": {
+            "shop/car_repair/Renault": {
                 "tags": {
                 "tags": {
-                    "name": "Best Buy",
-                    "shop": "electronics"
+                    "name": "Renault",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Best Buy",
+                "name": "Renault",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88004,12 +91918,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Comet": {
+            "shop/car_repair/Pit Stop": {
                 "tags": {
                 "tags": {
-                    "name": "Comet",
-                    "shop": "electronics"
+                    "name": "Pit Stop",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Comet",
+                "name": "Pit Stop",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88023,12 +91937,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Currys": {
+            "shop/car_repair/Jiffy Lube": {
                 "tags": {
                 "tags": {
-                    "name": "Currys",
-                    "shop": "electronics"
+                    "name": "Jiffy Lube",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Currys",
+                "name": "Jiffy Lube",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88042,12 +91956,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Darty": {
+            "shop/car_repair/Шиномонтаж": {
                 "tags": {
                 "tags": {
-                    "name": "Darty",
-                    "shop": "electronics"
+                    "name": "Шиномонтаж",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Darty",
+                "name": "Шиномонтаж",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88061,12 +91975,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Euronics": {
+            "shop/car_repair/СТО": {
                 "tags": {
                 "tags": {
-                    "name": "Euronics",
-                    "shop": "electronics"
+                    "name": "СТО",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Euronics",
+                "name": "СТО",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88080,12 +91994,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Expert": {
+            "shop/car_repair/O'Reilly Auto Parts": {
                 "tags": {
                 "tags": {
-                    "name": "Expert",
-                    "shop": "electronics"
+                    "name": "O'Reilly Auto Parts",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Expert",
+                "name": "O'Reilly Auto Parts",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88099,12 +92013,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Future Shop": {
+            "shop/car_repair/Carglass": {
                 "tags": {
                 "tags": {
-                    "name": "Future Shop",
-                    "shop": "electronics"
+                    "name": "Carglass",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Future Shop",
+                "name": "Carglass",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88118,12 +92032,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Maplin": {
+            "shop/car_repair/шиномонтаж": {
                 "tags": {
                 "tags": {
-                    "name": "Maplin",
-                    "shop": "electronics"
+                    "name": "шиномонтаж",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Maplin",
+                "name": "шиномонтаж",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88137,12 +92051,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Media Markt": {
+            "shop/car_repair/Euromaster": {
                 "tags": {
                 "tags": {
-                    "name": "Media Markt",
-                    "shop": "electronics"
+                    "name": "Euromaster",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Media Markt",
+                "name": "Euromaster",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88156,12 +92070,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Radio Shack": {
+            "shop/car_repair/Firestone": {
                 "tags": {
                 "tags": {
-                    "name": "Radio Shack",
-                    "shop": "electronics"
+                    "name": "Firestone",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Radio Shack",
+                "name": "Firestone",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88175,12 +92089,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Saturn": {
+            "shop/car_repair/AutoZone": {
                 "tags": {
                 "tags": {
-                    "name": "Saturn",
-                    "shop": "electronics"
+                    "name": "AutoZone",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Saturn",
+                "name": "AutoZone",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88194,12 +92108,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/М.Видео": {
+            "shop/car_repair/Автосервис": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\9c.Ð\92идео",
-                    "shop": "electronics"
+                    "name": "Ð\90вÑ\82оÑ\81еÑ\80виÑ\81",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Ð\9c.Ð\92идео",
+                "name": "Ð\90вÑ\82оÑ\81еÑ\80виÑ\81",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88213,12 +92127,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/electronics/Эльдорадо": {
+            "shop/car_repair/Roady": {
                 "tags": {
                 "tags": {
-                    "name": "Эльдорадо",
-                    "shop": "electronics"
+                    "name": "Roady",
+                    "shop": "car_repair"
                 },
                 },
-                "name": "Эльдорадо",
+                "name": "Roady",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88232,12 +92146,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/furniture/But": {
+            "shop/furniture/IKEA": {
                 "tags": {
                 "tags": {
-                    "name": "But",
+                    "name": "IKEA",
                     "shop": "furniture"
                 },
                     "shop": "furniture"
                 },
-                "name": "But",
+                "name": "IKEA",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88251,12 +92165,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Conforama": {
+            "shop/furniture/Jysk": {
                 "tags": {
                 "tags": {
-                    "name": "Conforama",
+                    "name": "Jysk",
                     "shop": "furniture"
                 },
                     "shop": "furniture"
                 },
-                "name": "Conforama",
+                "name": "Jysk",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88270,12 +92184,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Dänisches Bettenlager": {
+            "shop/furniture/Roller": {
                 "tags": {
                 "tags": {
-                    "name": "Dänisches Bettenlager",
+                    "name": "Roller",
                     "shop": "furniture"
                 },
                     "shop": "furniture"
                 },
-                "name": "Dänisches Bettenlager",
+                "name": "Roller",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88289,12 +92203,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/furniture/IKEA": {
+            "shop/furniture/Dänisches Bettenlager": {
                 "tags": {
                 "tags": {
-                    "name": "IKEA",
+                    "name": "Dänisches Bettenlager",
                     "shop": "furniture"
                 },
                     "shop": "furniture"
                 },
-                "name": "IKEA",
+                "name": "Dänisches Bettenlager",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88308,12 +92222,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Jysk": {
+            "shop/furniture/Conforama": {
                 "tags": {
                 "tags": {
-                    "name": "Jysk",
+                    "name": "Conforama",
                     "shop": "furniture"
                 },
                     "shop": "furniture"
                 },
-                "name": "Jysk",
+                "name": "Conforama",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88346,12 +92260,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Roller": {
+            "shop/furniture/Мебель": {
                 "tags": {
                 "tags": {
-                    "name": "Roller",
+                    "name": "Мебель",
                     "shop": "furniture"
                 },
                     "shop": "furniture"
                 },
-                "name": "Roller",
+                "name": "Мебель",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88365,12 +92279,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/furniture/Мебель": {
+            "shop/furniture/But": {
                 "tags": {
                 "tags": {
-                    "name": "Мебель",
+                    "name": "But",
                     "shop": "furniture"
                 },
                     "shop": "furniture"
                 },
-                "name": "Мебель",
+                "name": "But",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88384,12 +92298,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Coiffeur": {
+            "shop/doityourself/Hornbach": {
                 "tags": {
                 "tags": {
-                    "name": "Coiffeur",
-                    "shop": "hairdresser"
+                    "name": "Hornbach",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Coiffeur",
+                "name": "Hornbach",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88403,12 +92317,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Franck Provost": {
+            "shop/doityourself/B&Q": {
                 "tags": {
                 "tags": {
-                    "name": "Franck Provost",
-                    "shop": "hairdresser"
+                    "name": "B&Q",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Franck Provost",
+                "name": "B&Q",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88422,12 +92336,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Friseur": {
+            "shop/doityourself/Hubo": {
                 "tags": {
                 "tags": {
-                    "name": "Friseur",
-                    "shop": "hairdresser"
+                    "name": "Hubo",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Friseur",
+                "name": "Hubo",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88441,12 +92355,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Great Clips": {
+            "shop/doityourself/Mr Bricolage": {
                 "tags": {
                 "tags": {
-                    "name": "Great Clips",
-                    "shop": "hairdresser"
+                    "name": "Mr Bricolage",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Great Clips",
+                "name": "Mr Bricolage",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88460,12 +92374,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Klier": {
+            "shop/doityourself/Gamma": {
                 "tags": {
                 "tags": {
-                    "name": "Klier",
-                    "shop": "hairdresser"
+                    "name": "Gamma",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Klier",
+                "name": "Gamma",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88479,12 +92393,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Peluqueria": {
+            "shop/doityourself/OBI": {
                 "tags": {
                 "tags": {
-                    "name": "Peluqueria",
-                    "shop": "hairdresser"
+                    "name": "OBI",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Peluqueria",
+                "name": "OBI",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88498,12 +92412,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Supercuts": {
+            "shop/doityourself/Lowes": {
                 "tags": {
                 "tags": {
-                    "name": "Supercuts",
-                    "shop": "hairdresser"
+                    "name": "Lowes",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Supercuts",
+                "name": "Lowes",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88517,12 +92431,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Парикмахерская": {
+            "shop/doityourself/Wickes": {
                 "tags": {
                 "tags": {
-                    "name": "Парикмахерская",
-                    "shop": "hairdresser"
+                    "name": "Wickes",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Парикмахерская",
+                "name": "Wickes",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88536,12 +92450,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/hairdresser/Салон красоты": {
+            "shop/doityourself/Hagebau": {
                 "tags": {
                 "tags": {
-                    "name": "Салон красоты",
-                    "shop": "hairdresser"
+                    "name": "Hagebau",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Салон красоты",
+                "name": "Hagebau",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88555,12 +92469,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/hardware/1000 мелочей": {
+            "shop/doityourself/Max Bahr": {
                 "tags": {
                 "tags": {
-                    "name": "1000 мелочей",
-                    "shop": "hardware"
+                    "name": "Max Bahr",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "1000 мелочей",
+                "name": "Max Bahr",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88574,12 +92488,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/jewelry/Bijou Brigitte": {
+            "shop/doityourself/Castorama": {
                 "tags": {
                 "tags": {
-                    "name": "Bijou Brigitte",
-                    "shop": "jewelry"
+                    "name": "Castorama",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Bijou Brigitte",
+                "name": "Castorama",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88593,12 +92507,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/jewelry/Christ": {
+            "shop/doityourself/Rona": {
                 "tags": {
                 "tags": {
-                    "name": "Christ",
-                    "shop": "jewelry"
+                    "name": "Rona",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Christ",
+                "name": "Rona",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88612,12 +92526,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/jewelry/Swarovski": {
+            "shop/doityourself/Home Depot": {
                 "tags": {
                 "tags": {
-                    "name": "Swarovski",
-                    "shop": "jewelry"
+                    "name": "Home Depot",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Swarovski",
+                "name": "Home Depot",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88631,12 +92545,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/AT&T": {
+            "shop/doityourself/Toom Baumarkt": {
                 "tags": {
                 "tags": {
-                    "name": "AT&T",
-                    "shop": "mobile_phone"
+                    "name": "Toom Baumarkt",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "AT&T",
+                "name": "Toom Baumarkt",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88650,12 +92564,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Bell": {
+            "shop/doityourself/Homebase": {
                 "tags": {
                 "tags": {
-                    "name": "Bell",
-                    "shop": "mobile_phone"
+                    "name": "Homebase",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Bell",
+                "name": "Homebase",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88669,12 +92583,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Bitė": {
+            "shop/doityourself/Baumax": {
                 "tags": {
                 "tags": {
-                    "name": "Bitė",
-                    "shop": "mobile_phone"
+                    "name": "Baumax",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Bitė",
+                "name": "Baumax",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88688,12 +92602,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Carphone Warehouse": {
+            "shop/doityourself/Lagerhaus": {
                 "tags": {
                 "tags": {
-                    "name": "Carphone Warehouse",
-                    "shop": "mobile_phone"
+                    "name": "Lagerhaus",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Carphone Warehouse",
+                "name": "Lagerhaus",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88707,12 +92621,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Movistar": {
+            "shop/doityourself/Bauhaus": {
                 "tags": {
                 "tags": {
-                    "name": "Movistar",
-                    "shop": "mobile_phone"
+                    "name": "Bauhaus",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Movistar",
+                "name": "Bauhaus",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88726,12 +92640,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/O2": {
+            "shop/doityourself/Leroy Merlin": {
                 "tags": {
                 "tags": {
-                    "name": "O2",
-                    "shop": "mobile_phone"
+                    "name": "Leroy Merlin",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "O2",
+                "name": "Leroy Merlin",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88745,12 +92659,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Orange": {
+            "shop/doityourself/Hellweg": {
                 "tags": {
                 "tags": {
-                    "name": "Orange",
-                    "shop": "mobile_phone"
+                    "name": "Hellweg",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Orange",
+                "name": "Hellweg",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88764,12 +92678,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/SFR": {
+            "shop/doityourself/Brico": {
                 "tags": {
                 "tags": {
-                    "name": "SFR",
-                    "shop": "mobile_phone"
+                    "name": "Brico",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "SFR",
+                "name": "Brico",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88783,12 +92697,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Sprint": {
+            "shop/doityourself/Bricomarché": {
                 "tags": {
                 "tags": {
-                    "name": "Sprint",
-                    "shop": "mobile_phone"
+                    "name": "Bricomarché",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Sprint",
+                "name": "Bricomarché",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88802,12 +92716,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/T-Mobile": {
+            "shop/doityourself/Toom": {
                 "tags": {
                 "tags": {
-                    "name": "T-Mobile",
-                    "shop": "mobile_phone"
+                    "name": "Toom",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "T-Mobile",
+                "name": "Toom",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88821,12 +92735,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/The Phone House": {
+            "shop/doityourself/Praktiker": {
                 "tags": {
                 "tags": {
-                    "name": "The Phone House",
-                    "shop": "mobile_phone"
+                    "name": "Praktiker",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "The Phone House",
+                "name": "Praktiker",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88840,12 +92754,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Verizon Wireless": {
+            "shop/doityourself/Hagebaumarkt": {
                 "tags": {
                 "tags": {
-                    "name": "Verizon Wireless",
-                    "shop": "mobile_phone"
+                    "name": "Hagebaumarkt",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Verizon Wireless",
+                "name": "Hagebaumarkt",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88859,12 +92773,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Vodafone": {
+            "shop/doityourself/Menards": {
                 "tags": {
                 "tags": {
-                    "name": "Vodafone",
-                    "shop": "mobile_phone"
+                    "name": "Menards",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Vodafone",
+                "name": "Menards",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88878,12 +92792,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/au": {
+            "shop/doityourself/Weldom": {
                 "tags": {
                 "tags": {
-                    "name": "au",
-                    "shop": "mobile_phone"
+                    "name": "Weldom",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "au",
+                "name": "Weldom",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88897,12 +92811,50 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Билайн": {
+            "shop/doityourself/Bunnings Warehouse": {
                 "tags": {
                 "tags": {
-                    "name": "Билайн",
-                    "shop": "mobile_phone"
+                    "name": "Bunnings Warehouse",
+                    "shop": "doityourself"
+                },
+                "name": "Bunnings Warehouse",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/doityourself/Ace Hardware": {
+                "tags": {
+                    "name": "Ace Hardware",
+                    "shop": "doityourself"
+                },
+                "name": "Ace Hardware",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/doityourself/Home Hardware": {
+                "tags": {
+                    "name": "Home Hardware",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Билайн",
+                "name": "Home Hardware",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88916,12 +92868,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Евросеть": {
+            "shop/doityourself/Хозтовары": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\95вÑ\80оÑ\81еÑ\82Ñ\8c",
-                    "shop": "mobile_phone"
+                    "name": "ХозÑ\82оваÑ\80Ñ\8b",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Ð\95вÑ\80оÑ\81еÑ\82Ñ\8c",
+                "name": "ХозÑ\82оваÑ\80Ñ\8b",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88935,12 +92887,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/МТС": {
+            "shop/doityourself/Стройматериалы": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\9cТС",
-                    "shop": "mobile_phone"
+                    "name": "СÑ\82Ñ\80оймаÑ\82еÑ\80иалÑ\8b",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Ð\9cТС",
+                "name": "СÑ\82Ñ\80оймаÑ\82еÑ\80иалÑ\8b",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88954,12 +92906,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Мегафон": {
+            "shop/doityourself/Bricorama": {
                 "tags": {
                 "tags": {
-                    "name": "Мегафон",
-                    "shop": "mobile_phone"
+                    "name": "Bricorama",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Мегафон",
+                "name": "Bricorama",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88973,12 +92925,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/Связной": {
+            "shop/doityourself/Point P": {
                 "tags": {
                 "tags": {
-                    "name": "Связной",
-                    "shop": "mobile_phone"
+                    "name": "Point P",
+                    "shop": "doityourself"
                 },
                 },
-                "name": "Связной",
+                "name": "Point P",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -88992,12 +92944,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/ソフトバンクショップ (SoftBank shop)": {
+            "shop/department_store/Target": {
                 "tags": {
                 "tags": {
-                    "name": "ソフトバンクショップ (SoftBank shop)",
-                    "shop": "mobile_phone"
+                    "name": "Target",
+                    "shop": "department_store"
                 },
                 },
-                "name": "ソフトバンクショップ (SoftBank shop)",
+                "name": "Target",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89011,12 +92963,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/mobile_phone/ドコモショップ (docomo shop)": {
+            "shop/department_store/Debenhams": {
                 "tags": {
                 "tags": {
-                    "name": "ドコモショップ (docomo shop)",
-                    "shop": "mobile_phone"
+                    "name": "Debenhams",
+                    "shop": "department_store"
                 },
                 },
-                "name": "ドコモショップ (docomo shop)",
+                "name": "Debenhams",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89030,12 +92982,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/motorcycle/Yamaha": {
+            "shop/department_store/Karstadt": {
                 "tags": {
                 "tags": {
-                    "name": "Yamaha",
-                    "shop": "motorcycle"
+                    "name": "Karstadt",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Yamaha",
+                "name": "Karstadt",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89049,12 +93001,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/optician/Alain Afflelou": {
+            "shop/department_store/Kmart": {
                 "tags": {
                 "tags": {
-                    "name": "Alain Afflelou",
-                    "shop": "optician"
+                    "name": "Kmart",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Alain Afflelou",
+                "name": "Kmart",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89068,12 +93020,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/optician/Apollo Optik": {
+            "shop/department_store/Galeria Kaufhof": {
                 "tags": {
                 "tags": {
-                    "name": "Apollo Optik",
-                    "shop": "optician"
+                    "name": "Galeria Kaufhof",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Apollo Optik",
+                "name": "Galeria Kaufhof",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89087,12 +93039,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/optician/Fielmann": {
+            "shop/department_store/Marks & Spencer": {
                 "tags": {
                 "tags": {
-                    "name": "Fielmann",
-                    "shop": "optician"
+                    "name": "Marks & Spencer",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Fielmann",
+                "name": "Marks & Spencer",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89106,12 +93058,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/optician/Krys": {
+            "shop/department_store/Big W": {
                 "tags": {
                 "tags": {
-                    "name": "Krys",
-                    "shop": "optician"
+                    "name": "Big W",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Krys",
+                "name": "Big W",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89125,12 +93077,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/optician/Optic 2000": {
+            "shop/department_store/Woolworth": {
                 "tags": {
                 "tags": {
-                    "name": "Optic 2000",
-                    "shop": "optician"
+                    "name": "Woolworth",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Optic 2000",
+                "name": "Woolworth",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89144,12 +93096,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/optician/Specsavers": {
+            "shop/department_store/Универмаг": {
                 "tags": {
                 "tags": {
-                    "name": "Specsavers",
-                    "shop": "optician"
+                    "name": "Универмаг",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Specsavers",
+                "name": "Универмаг",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89163,12 +93115,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/optician/Vision Express": {
+            "shop/department_store/Sears": {
                 "tags": {
                 "tags": {
-                    "name": "Vision Express",
-                    "shop": "optician"
+                    "name": "Sears",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Vision Express",
+                "name": "Sears",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89182,12 +93134,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/optician/Оптика": {
+            "shop/department_store/Kohl's": {
                 "tags": {
                 "tags": {
-                    "name": "Оптика",
-                    "shop": "optician"
+                    "name": "Kohl's",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Оптика",
+                "name": "Kohl's",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -89201,13 +93153,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/pet/Das Futterhaus": {
+            "shop/department_store/Macy's": {
                 "tags": {
                 "tags": {
-                    "name": "Das Futterhaus",
-                    "shop": "pet"
+                    "name": "Macy's",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Das Futterhaus",
-                "icon": "dog-park",
+                "name": "Macy's",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89220,13 +93172,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/pet/Fressnapf": {
+            "shop/department_store/JCPenney": {
                 "tags": {
                 "tags": {
-                    "name": "Fressnapf",
-                    "shop": "pet"
+                    "name": "JCPenney",
+                    "shop": "department_store"
                 },
                 },
-                "name": "Fressnapf",
-                "icon": "dog-park",
+                "name": "JCPenney",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89239,13 +93191,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/pet/PetSmart": {
+            "shop/stationery/Staples": {
                 "tags": {
                 "tags": {
-                    "name": "PetSmart",
-                    "shop": "pet"
+                    "name": "Staples",
+                    "shop": "stationery"
                 },
                 },
-                "name": "PetSmart",
-                "icon": "dog-park",
+                "name": "Staples",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89258,13 +93210,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/pet/Petco": {
+            "shop/stationery/McPaper": {
                 "tags": {
                 "tags": {
-                    "name": "Petco",
-                    "shop": "pet"
+                    "name": "McPaper",
+                    "shop": "stationery"
                 },
                 },
-                "name": "Petco",
-                "icon": "dog-park",
+                "name": "McPaper",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89277,13 +93229,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/pet/Pets at Home": {
+            "shop/stationery/Office Depot": {
                 "tags": {
                 "tags": {
-                    "name": "Pets at Home",
-                    "shop": "pet"
+                    "name": "Office Depot",
+                    "shop": "stationery"
                 },
                 },
-                "name": "Pets at Home",
-                "icon": "dog-park",
+                "name": "Office Depot",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89296,13 +93248,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/pet/Зоомагазин": {
+            "shop/stationery/Канцтовары": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\97оомагазин",
-                    "shop": "pet"
+                    "name": "Ð\9aанÑ\86Ñ\82оваÑ\80Ñ\8b",
+                    "shop": "stationery"
                 },
                 },
-                "name": "Ð\97оомагазин",
-                "icon": "dog-park",
+                "name": "Ð\9aанÑ\86Ñ\82оваÑ\80Ñ\8b",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89315,13 +93267,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Bata": {
+            "shop/car/Skoda": {
                 "tags": {
                 "tags": {
-                    "name": "Bata",
-                    "shop": "shoes"
+                    "name": "Skoda",
+                    "shop": "car"
                 },
                 },
-                "name": "Bata",
-                "icon": "shop",
+                "name": "Skoda",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89329,18 +93281,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Brantano": {
+            "shop/car/BMW": {
                 "tags": {
                 "tags": {
-                    "name": "Brantano",
-                    "shop": "shoes"
+                    "name": "BMW",
+                    "shop": "car"
                 },
                 },
-                "name": "Brantano",
-                "icon": "shop",
+                "name": "BMW",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89348,18 +93299,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Clarks": {
+            "shop/car/Citroen": {
                 "tags": {
                 "tags": {
-                    "name": "Clarks",
-                    "shop": "shoes"
+                    "name": "Citroen",
+                    "shop": "car"
                 },
                 },
-                "name": "Clarks",
-                "icon": "shop",
+                "name": "Citroen",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89367,18 +93317,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Ecco": {
+            "shop/car/Mercedes-Benz": {
                 "tags": {
                 "tags": {
-                    "name": "Ecco",
-                    "shop": "shoes"
+                    "name": "Mercedes-Benz",
+                    "shop": "car"
                 },
                 },
-                "name": "Ecco",
-                "icon": "shop",
+                "name": "Mercedes-Benz",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89386,18 +93335,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Foot Locker": {
+            "shop/car/Volvo": {
                 "tags": {
                 "tags": {
-                    "name": "Foot Locker",
-                    "shop": "shoes"
+                    "name": "Volvo",
+                    "shop": "car"
                 },
                 },
-                "name": "Foot Locker",
-                "icon": "shop",
+                "name": "Volvo",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89405,18 +93353,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/La Halle aux Chaussures": {
+            "shop/car/Ford": {
                 "tags": {
                 "tags": {
-                    "name": "La Halle aux Chaussures",
-                    "shop": "shoes"
+                    "name": "Ford",
+                    "shop": "car"
                 },
                 },
-                "name": "La Halle aux Chaussures",
-                "icon": "shop",
+                "name": "Ford",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89424,18 +93371,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Payless Shoe Source": {
+            "shop/car/Volkswagen": {
                 "tags": {
                 "tags": {
-                    "name": "Payless Shoe Source",
-                    "shop": "shoes"
+                    "name": "Volkswagen",
+                    "shop": "car"
                 },
                 },
-                "name": "Payless Shoe Source",
-                "icon": "shop",
+                "name": "Volkswagen",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89443,18 +93389,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Quick Schuh": {
+            "shop/car/Mazda": {
                 "tags": {
                 "tags": {
-                    "name": "Quick Schuh",
-                    "shop": "shoes"
+                    "name": "Mazda",
+                    "shop": "car"
                 },
                 },
-                "name": "Quick Schuh",
-                "icon": "shop",
+                "name": "Mazda",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89462,18 +93407,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Reno": {
+            "shop/car/Mitsubishi": {
                 "tags": {
                 "tags": {
-                    "name": "Reno",
-                    "shop": "shoes"
+                    "name": "Mitsubishi",
+                    "shop": "car"
                 },
                 },
-                "name": "Reno",
-                "icon": "shop",
+                "name": "Mitsubishi",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89481,18 +93425,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Salamander": {
+            "shop/car/Fiat": {
                 "tags": {
                 "tags": {
-                    "name": "Salamander",
-                    "shop": "shoes"
+                    "name": "Fiat",
+                    "shop": "car"
                 },
                 },
-                "name": "Salamander",
-                "icon": "shop",
+                "name": "Fiat",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89500,18 +93443,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/shoes/Обувь": {
+            "shop/car/Opel": {
                 "tags": {
                 "tags": {
-                    "name": "Обувь",
-                    "shop": "shoes"
+                    "name": "Opel",
+                    "shop": "car"
                 },
                 },
-                "name": "Обувь",
-                "icon": "shop",
+                "name": "Opel",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89519,18 +93461,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Decathlon": {
+            "shop/car/Audi": {
                 "tags": {
                 "tags": {
-                    "name": "Decathlon",
-                    "shop": "sports"
+                    "name": "Audi",
+                    "shop": "car"
                 },
                 },
-                "name": "Decathlon",
-                "icon": "shop",
+                "name": "Audi",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89538,18 +93479,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Dick's Sporting Goods": {
+            "shop/car/Toyota": {
                 "tags": {
                 "tags": {
-                    "name": "Dick's Sporting Goods",
-                    "shop": "sports"
+                    "name": "Toyota",
+                    "shop": "car"
                 },
                 },
-                "name": "Dick's Sporting Goods",
-                "icon": "shop",
+                "name": "Toyota",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89557,18 +93497,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Intersport": {
+            "shop/car/Nissan": {
                 "tags": {
                 "tags": {
-                    "name": "Intersport",
-                    "shop": "sports"
+                    "name": "Nissan",
+                    "shop": "car"
                 },
                 },
-                "name": "Intersport",
-                "icon": "shop",
+                "name": "Nissan",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89576,18 +93515,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Sport 2000": {
+            "shop/car/Suzuki": {
                 "tags": {
                 "tags": {
-                    "name": "Sport 2000",
-                    "shop": "sports"
+                    "name": "Suzuki",
+                    "shop": "car"
                 },
                 },
-                "name": "Sport 2000",
-                "icon": "shop",
+                "name": "Suzuki",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89595,18 +93533,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Sports Authority": {
+            "shop/car/Honda": {
                 "tags": {
                 "tags": {
-                    "name": "Sports Authority",
-                    "shop": "sports"
+                    "name": "Honda",
+                    "shop": "car"
                 },
                 },
-                "name": "Sports Authority",
-                "icon": "shop",
+                "name": "Honda",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89614,18 +93551,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/sports/Спортмастер": {
+            "shop/car/Hyundai": {
                 "tags": {
                 "tags": {
-                    "name": "Спортмастер",
-                    "shop": "sports"
+                    "name": "Hyundai",
+                    "shop": "car"
                 },
                 },
-                "name": "Спортмастер",
-                "icon": "shop",
+                "name": "Hyundai",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89633,18 +93569,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/stationery/McPaper": {
+            "shop/car/Subaru": {
                 "tags": {
                 "tags": {
-                    "name": "McPaper",
-                    "shop": "stationery"
+                    "name": "Subaru",
+                    "shop": "car"
                 },
                 },
-                "name": "McPaper",
-                "icon": "shop",
+                "name": "Subaru",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89652,18 +93587,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/stationery/Office Depot": {
+            "shop/car/Chevrolet": {
                 "tags": {
                 "tags": {
-                    "name": "Office Depot",
-                    "shop": "stationery"
+                    "name": "Chevrolet",
+                    "shop": "car"
                 },
                 },
-                "name": "Office Depot",
-                "icon": "shop",
+                "name": "Chevrolet",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89671,18 +93605,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/stationery/Staples": {
+            "shop/car/Автомагазин": {
                 "tags": {
                 "tags": {
-                    "name": "Staples",
-                    "shop": "stationery"
+                    "name": "Автомагазин",
+                    "shop": "car"
                 },
                 },
-                "name": "Staples",
-                "icon": "shop",
+                "name": "Автомагазин",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89690,18 +93623,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "address",
                 ],
                 "fields": [
                     "address",
-                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/stationery/Канцтовары": {
+            "shop/clothes/Matalan": {
                 "tags": {
                 "tags": {
-                    "name": "Канцтовары",
-                    "shop": "stationery"
+                    "name": "Matalan",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Канцтовары",
-                "icon": "shop",
+                "name": "Matalan",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -89714,3508 +93646,3508 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/AD Delhaize": {
+            "shop/clothes/KiK": {
                 "tags": {
                 "tags": {
-                    "name": "AD Delhaize",
-                    "shop": "supermarket"
+                    "name": "KiK",
+                    "shop": "clothes"
                 },
                 },
-                "name": "AD Delhaize",
-                "icon": "grocery",
+                "name": "KiK",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/ADEG": {
+            "shop/clothes/H&M": {
                 "tags": {
                 "tags": {
-                    "name": "ADEG",
-                    "shop": "supermarket"
+                    "name": "H&M",
+                    "shop": "clothes"
                 },
                 },
-                "name": "ADEG",
-                "icon": "grocery",
+                "name": "H&M",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/ALDI": {
+            "shop/clothes/Urban Outfitters": {
                 "tags": {
                 "tags": {
-                    "name": "ALDI",
-                    "shop": "supermarket"
+                    "name": "Urban Outfitters",
+                    "shop": "clothes"
                 },
                 },
-                "name": "ALDI",
-                "icon": "grocery",
+                "name": "Urban Outfitters",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Aldi Süd": {
+            "shop/clothes/Vögele": {
                 "tags": {
                 "tags": {
-                    "name": "Aldi Süd",
-                    "shop": "supermarket"
+                    "name": "Vögele",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Aldi Süd",
-                "icon": "grocery",
+                "name": "Vögele",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/ASDA": {
+            "shop/clothes/Zeeman": {
                 "tags": {
                 "tags": {
-                    "name": "ASDA",
-                    "shop": "supermarket"
+                    "name": "Zeeman",
+                    "shop": "clothes"
                 },
                 },
-                "name": "ASDA",
-                "icon": "grocery",
+                "name": "Zeeman",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Albert": {
+            "shop/clothes/Takko": {
                 "tags": {
                 "tags": {
-                    "name": "Albert",
-                    "shop": "supermarket"
+                    "name": "Takko",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Albert",
-                "icon": "grocery",
+                "name": "Takko",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Albert Heijn": {
+            "shop/clothes/C&A": {
                 "tags": {
                 "tags": {
-                    "name": "Albert Heijn",
-                    "shop": "supermarket"
+                    "name": "C&A",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Albert Heijn",
-                "icon": "grocery",
+                "name": "C&A",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Albertsons": {
+            "shop/clothes/Zara": {
                 "tags": {
                 "tags": {
-                    "name": "Albertsons",
-                    "shop": "supermarket"
+                    "name": "Zara",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Albertsons",
-                "icon": "grocery",
+                "name": "Zara",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Aldi Nord": {
+            "shop/clothes/Vero Moda": {
                 "tags": {
                 "tags": {
-                    "name": "Aldi Nord",
-                    "shop": "supermarket"
+                    "name": "Vero Moda",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Aldi Nord",
-                "icon": "grocery",
+                "name": "Vero Moda",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Alimerka": {
+            "shop/clothes/NKD": {
                 "tags": {
                 "tags": {
-                    "name": "Alimerka",
-                    "shop": "supermarket"
+                    "name": "NKD",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Alimerka",
-                "icon": "grocery",
+                "name": "NKD",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Asda": {
+            "shop/clothes/Ernsting's family": {
                 "tags": {
                 "tags": {
-                    "name": "Asda",
-                    "shop": "supermarket"
+                    "name": "Ernsting's family",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Asda",
-                "icon": "grocery",
+                "name": "Ernsting's family",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Billa": {
+            "shop/clothes/Winners": {
                 "tags": {
                 "tags": {
-                    "name": "Billa",
-                    "shop": "supermarket"
+                    "name": "Winners",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Billa",
-                "icon": "grocery",
+                "name": "Winners",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Bodega Aurrera": {
+            "shop/clothes/River Island": {
                 "tags": {
                 "tags": {
-                    "name": "Bodega Aurrera",
-                    "shop": "supermarket"
+                    "name": "River Island",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Bodega Aurrera",
-                "icon": "grocery",
+                "name": "River Island",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Budgens": {
+            "shop/clothes/Next": {
                 "tags": {
                 "tags": {
-                    "name": "Budgens",
-                    "shop": "supermarket"
+                    "name": "Next",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Budgens",
-                "icon": "grocery",
+                "name": "Next",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/C1000": {
+            "shop/clothes/Gap": {
                 "tags": {
                 "tags": {
-                    "name": "C1000",
-                    "shop": "supermarket"
+                    "name": "Gap",
+                    "shop": "clothes"
                 },
                 },
-                "name": "C1000",
-                "icon": "grocery",
+                "name": "Gap",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Caprabo": {
+            "shop/clothes/Adidas": {
                 "tags": {
                 "tags": {
-                    "name": "Caprabo",
-                    "shop": "supermarket"
+                    "name": "Adidas",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Caprabo",
-                "icon": "grocery",
+                "name": "Adidas",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Carrefour Contact": {
+            "shop/clothes/Mr Price": {
                 "tags": {
                 "tags": {
-                    "name": "Carrefour Contact",
-                    "shop": "supermarket"
+                    "name": "Mr Price",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Carrefour Contact",
-                "icon": "grocery",
+                "name": "Mr Price",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Carrefour Market": {
+            "shop/clothes/Pep": {
                 "tags": {
                 "tags": {
-                    "name": "Carrefour Market",
-                    "shop": "supermarket"
+                    "name": "Pep",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Carrefour Market",
-                "icon": "grocery",
+                "name": "Pep",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Champion": {
+            "shop/clothes/Edgars": {
                 "tags": {
                 "tags": {
-                    "name": "Champion",
-                    "shop": "supermarket"
+                    "name": "Edgars",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Champion",
-                "icon": "grocery",
+                "name": "Edgars",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Checkers": {
+            "shop/clothes/Ackermans": {
                 "tags": {
                 "tags": {
-                    "name": "Checkers",
-                    "shop": "supermarket"
+                    "name": "Ackermans",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Checkers",
-                "icon": "grocery",
+                "name": "Ackermans",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Coles": {
+            "shop/clothes/Truworths": {
                 "tags": {
                 "tags": {
-                    "name": "Coles",
-                    "shop": "supermarket"
+                    "name": "Truworths",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Coles",
-                "icon": "grocery",
+                "name": "Truworths",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Colruyt": {
+            "shop/clothes/Ross": {
                 "tags": {
                 "tags": {
-                    "name": "Colruyt",
-                    "shop": "supermarket"
+                    "name": "Ross",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Colruyt",
-                "icon": "grocery",
+                "name": "Ross",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Combi": {
+            "shop/clothes/Dorothy Perkins": {
                 "tags": {
                 "tags": {
-                    "name": "Combi",
-                    "shop": "supermarket"
+                    "name": "Dorothy Perkins",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Combi",
-                "icon": "grocery",
+                "name": "Dorothy Perkins",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Conad": {
+            "shop/clothes/Deichmann": {
                 "tags": {
                 "tags": {
-                    "name": "Conad",
-                    "shop": "supermarket"
+                    "name": "Deichmann",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Conad",
-                "icon": "grocery",
+                "name": "Deichmann",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Condis": {
+            "shop/clothes/Lindex": {
                 "tags": {
                 "tags": {
-                    "name": "Condis",
-                    "shop": "supermarket"
+                    "name": "Lindex",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Condis",
-                "icon": "grocery",
+                "name": "Lindex",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Consum": {
+            "shop/clothes/s.Oliver": {
                 "tags": {
                 "tags": {
-                    "name": "Consum",
-                    "shop": "supermarket"
+                    "name": "s.Oliver",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Consum",
-                "icon": "grocery",
+                "name": "s.Oliver",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Continente": {
+            "shop/clothes/Old Navy": {
                 "tags": {
                 "tags": {
-                    "name": "Continente",
-                    "shop": "supermarket"
+                    "name": "Old Navy",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Continente",
-                "icon": "grocery",
+                "name": "Old Navy",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Coop Konsum": {
+            "shop/clothes/Jack & Jones": {
                 "tags": {
                 "tags": {
-                    "name": "Coop Konsum",
-                    "shop": "supermarket"
+                    "name": "Jack & Jones",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Coop Konsum",
-                "icon": "grocery",
+                "name": "Jack & Jones",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Costco": {
+            "shop/clothes/Pimkie": {
                 "tags": {
                 "tags": {
-                    "name": "Costco",
-                    "shop": "supermarket"
+                    "name": "Pimkie",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Costco",
-                "icon": "grocery",
+                "name": "Pimkie",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Countdown": {
+            "shop/clothes/Esprit": {
                 "tags": {
                 "tags": {
-                    "name": "Countdown",
-                    "shop": "supermarket"
+                    "name": "Esprit",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Countdown",
-                "icon": "grocery",
+                "name": "Esprit",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Dia": {
+            "shop/clothes/Primark": {
                 "tags": {
                 "tags": {
-                    "name": "Dia",
-                    "shop": "supermarket"
+                    "name": "Primark",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Dia",
-                "icon": "grocery",
+                "name": "Primark",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Delhaize": {
+            "shop/clothes/Bonita": {
                 "tags": {
                 "tags": {
-                    "name": "Delhaize",
-                    "shop": "supermarket"
+                    "name": "Bonita",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Delhaize",
-                "icon": "grocery",
+                "name": "Bonita",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Delikatesy Centrum": {
+            "shop/clothes/Mexx": {
                 "tags": {
                 "tags": {
-                    "name": "Delikatesy Centrum",
-                    "shop": "supermarket"
+                    "name": "Mexx",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Delikatesy Centrum",
-                "icon": "grocery",
+                "name": "Mexx",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Denner": {
+            "shop/clothes/Gerry Weber": {
                 "tags": {
                 "tags": {
-                    "name": "Denner",
-                    "shop": "supermarket"
+                    "name": "Gerry Weber",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Denner",
-                "icon": "grocery",
+                "name": "Gerry Weber",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Despar": {
+            "shop/clothes/Tally Weijl": {
                 "tags": {
                 "tags": {
-                    "name": "Despar",
-                    "shop": "supermarket"
+                    "name": "Tally Weijl",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Despar",
-                "icon": "grocery",
+                "name": "Tally Weijl",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Diska": {
+            "shop/clothes/Mango": {
                 "tags": {
                 "tags": {
-                    "name": "Diska",
-                    "shop": "supermarket"
+                    "name": "Mango",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Diska",
-                "icon": "grocery",
+                "name": "Mango",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Dunnes Stores": {
+            "shop/clothes/TK Maxx": {
                 "tags": {
                 "tags": {
-                    "name": "Dunnes Stores",
-                    "shop": "supermarket"
+                    "name": "TK Maxx",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Dunnes Stores",
-                "icon": "grocery",
+                "name": "TK Maxx",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/E-Center": {
+            "shop/clothes/Benetton": {
                 "tags": {
                 "tags": {
-                    "name": "E-Center",
-                    "shop": "supermarket"
+                    "name": "Benetton",
+                    "shop": "clothes"
                 },
                 },
-                "name": "E-Center",
-                "icon": "grocery",
+                "name": "Benetton",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/EDEKA": {
+            "shop/clothes/Ulla Popken": {
                 "tags": {
                 "tags": {
-                    "name": "EDEKA",
-                    "shop": "supermarket"
+                    "name": "Ulla Popken",
+                    "shop": "clothes"
                 },
                 },
-                "name": "EDEKA",
-                "icon": "grocery",
+                "name": "Ulla Popken",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Edeka": {
+            "shop/clothes/AWG": {
                 "tags": {
                 "tags": {
-                    "name": "Edeka",
-                    "shop": "supermarket"
+                    "name": "AWG",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Edeka",
-                "icon": "grocery",
+                "name": "AWG",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/El Árbol": {
+            "shop/clothes/Tommy Hilfiger": {
                 "tags": {
                 "tags": {
-                    "name": "El Árbol",
-                    "shop": "supermarket"
+                    "name": "Tommy Hilfiger",
+                    "shop": "clothes"
                 },
                 },
-                "name": "El Árbol",
-                "icon": "grocery",
+                "name": "Tommy Hilfiger",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Eroski": {
+            "shop/clothes/New Yorker": {
                 "tags": {
                 "tags": {
-                    "name": "Eroski",
-                    "shop": "supermarket"
+                    "name": "New Yorker",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Eroski",
-                "icon": "grocery",
+                "name": "New Yorker",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Esselunga": {
+            "shop/clothes/Orsay": {
                 "tags": {
                 "tags": {
-                    "name": "Esselunga",
-                    "shop": "supermarket"
+                    "name": "Orsay",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Esselunga",
-                "icon": "grocery",
+                "name": "Orsay",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Eurospar": {
+            "shop/clothes/Charles Vögele": {
                 "tags": {
                 "tags": {
-                    "name": "Eurospar",
-                    "shop": "supermarket"
+                    "name": "Charles Vögele",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Eurospar",
-                "icon": "grocery",
+                "name": "Charles Vögele",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Eurospin": {
+            "shop/clothes/New Look": {
                 "tags": {
                 "tags": {
-                    "name": "Eurospin",
-                    "shop": "supermarket"
+                    "name": "New Look",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Eurospin",
-                "icon": "grocery",
+                "name": "New Look",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Extra": {
+            "shop/clothes/Lacoste": {
                 "tags": {
                 "tags": {
-                    "name": "Extra",
-                    "shop": "supermarket"
+                    "name": "Lacoste",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Extra",
-                "icon": "grocery",
+                "name": "Lacoste",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Fakta": {
+            "shop/clothes/Etam": {
                 "tags": {
                 "tags": {
-                    "name": "Fakta",
-                    "shop": "supermarket"
+                    "name": "Etam",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Fakta",
-                "icon": "grocery",
+                "name": "Etam",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Famiglia Cooperativa": {
+            "shop/clothes/Kiabi": {
                 "tags": {
                 "tags": {
-                    "name": "Famiglia Cooperativa",
-                    "shop": "supermarket"
+                    "name": "Kiabi",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Famiglia Cooperativa",
-                "icon": "grocery",
+                "name": "Kiabi",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Famila": {
+            "shop/clothes/Jack Wolfskin": {
                 "tags": {
                 "tags": {
-                    "name": "Famila",
-                    "shop": "supermarket"
+                    "name": "Jack Wolfskin",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Famila",
-                "icon": "grocery",
+                "name": "Jack Wolfskin",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Farmfoods": {
+            "shop/clothes/American Apparel": {
                 "tags": {
                 "tags": {
-                    "name": "Farmfoods",
-                    "shop": "supermarket"
+                    "name": "American Apparel",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Farmfoods",
-                "icon": "grocery",
+                "name": "American Apparel",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Feneberg": {
+            "shop/clothes/Men's Wearhouse": {
                 "tags": {
                 "tags": {
-                    "name": "Feneberg",
-                    "shop": "supermarket"
+                    "name": "Men's Wearhouse",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Feneberg",
-                "icon": "grocery",
+                "name": "Men's Wearhouse",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Food Basics": {
+            "shop/clothes/Intimissimi": {
                 "tags": {
                 "tags": {
-                    "name": "Food Basics",
-                    "shop": "supermarket"
+                    "name": "Intimissimi",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Food Basics",
-                "icon": "grocery",
+                "name": "Intimissimi",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Food Lion": {
+            "shop/clothes/United Colors of Benetton": {
                 "tags": {
                 "tags": {
-                    "name": "Food Lion",
-                    "shop": "supermarket"
+                    "name": "United Colors of Benetton",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Food Lion",
-                "icon": "grocery",
+                "name": "United Colors of Benetton",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Foodland": {
+            "shop/clothes/Jules": {
                 "tags": {
                 "tags": {
-                    "name": "Foodland",
-                    "shop": "supermarket"
+                    "name": "Jules",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Foodland",
-                "icon": "grocery",
+                "name": "Jules",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Foodworks": {
+            "shop/clothes/AOKI": {
                 "tags": {
                 "tags": {
-                    "name": "Foodworks",
-                    "shop": "supermarket"
+                    "name": "AOKI",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Foodworks",
-                "icon": "grocery",
+                "name": "AOKI",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Fred Meyer": {
+            "shop/clothes/Calzedonia": {
                 "tags": {
                 "tags": {
-                    "name": "Fred Meyer",
-                    "shop": "supermarket"
+                    "name": "Calzedonia",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Fred Meyer",
-                "icon": "grocery",
+                "name": "Calzedonia",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Føtex": {
+            "shop/clothes/洋服の青山": {
                 "tags": {
                 "tags": {
-                    "name": "Føtex",
-                    "shop": "supermarket"
+                    "name": "洋服の青山",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Føtex",
-                "icon": "grocery",
+                "name": "洋服の青山",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Game": {
+            "shop/clothes/Levi's": {
                 "tags": {
                 "tags": {
-                    "name": "Game",
-                    "shop": "supermarket"
+                    "name": "Levi's",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Game",
-                "icon": "grocery",
+                "name": "Levi's",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Giant": {
+            "shop/clothes/Celio": {
                 "tags": {
                 "tags": {
-                    "name": "Giant",
-                    "shop": "supermarket"
+                    "name": "Celio",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Giant",
-                "icon": "grocery",
+                "name": "Celio",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Giant Eagle": {
+            "shop/clothes/TJ Maxx": {
                 "tags": {
                 "tags": {
-                    "name": "Giant Eagle",
-                    "shop": "supermarket"
+                    "name": "TJ Maxx",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Giant Eagle",
-                "icon": "grocery",
+                "name": "TJ Maxx",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Géant Casino": {
+            "shop/clothes/Promod": {
                 "tags": {
                 "tags": {
-                    "name": "Géant Casino",
-                    "shop": "supermarket"
+                    "name": "Promod",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Géant Casino",
-                "icon": "grocery",
+                "name": "Promod",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/HEB": {
+            "shop/clothes/Street One": {
                 "tags": {
                 "tags": {
-                    "name": "HEB",
-                    "shop": "supermarket"
+                    "name": "Street One",
+                    "shop": "clothes"
                 },
                 },
-                "name": "HEB",
-                "icon": "grocery",
+                "name": "Street One",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/HIT": {
+            "shop/clothes/ユニクロ": {
                 "tags": {
                 "tags": {
-                    "name": "HIT",
-                    "shop": "supermarket"
+                    "name": "ユニクロ",
+                    "shop": "clothes"
                 },
                 },
-                "name": "HIT",
-                "icon": "grocery",
+                "name": "ユニクロ",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Hannaford": {
+            "shop/clothes/Banana Republic": {
                 "tags": {
                 "tags": {
-                    "name": "Hannaford",
-                    "shop": "supermarket"
+                    "name": "Banana Republic",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Hannaford",
-                "icon": "grocery",
+                "name": "Banana Republic",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Harris Teeter": {
+            "shop/clothes/Одежда": {
                 "tags": {
                 "tags": {
-                    "name": "Harris Teeter",
-                    "shop": "supermarket"
+                    "name": "Одежда",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Harris Teeter",
-                "icon": "grocery",
+                "name": "Одежда",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Hemköp": {
+            "shop/clothes/La Halle": {
                 "tags": {
                 "tags": {
-                    "name": "Hemköp",
-                    "shop": "supermarket"
+                    "name": "La Halle",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Hemköp",
-                "icon": "grocery",
+                "name": "La Halle",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Hofer": {
+            "shop/clothes/Peacocks": {
                 "tags": {
                 "tags": {
-                    "name": "Hofer",
-                    "shop": "supermarket"
+                    "name": "Peacocks",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Hofer",
-                "icon": "grocery",
+                "name": "Peacocks",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Hoogvliet": {
+            "shop/clothes/しまむら": {
                 "tags": {
                 "tags": {
-                    "name": "Hoogvliet",
-                    "shop": "supermarket"
+                    "name": "しまむら",
+                    "shop": "clothes"
                 },
                 },
-                "name": "Hoogvliet",
-                "icon": "grocery",
+                "name": "しまむら",
+                "icon": "clothing-store",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Hy-Vee": {
+            "shop/books/Bruna": {
                 "tags": {
                 "tags": {
-                    "name": "Hy-Vee",
-                    "shop": "supermarket"
+                    "name": "Bruna",
+                    "shop": "books"
                 },
                 },
-                "name": "Hy-Vee",
-                "icon": "grocery",
+                "name": "Bruna",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/ICA": {
+            "shop/books/Waterstones": {
                 "tags": {
                 "tags": {
-                    "name": "ICA",
-                    "shop": "supermarket"
+                    "name": "Waterstones",
+                    "shop": "books"
                 },
                 },
-                "name": "ICA",
-                "icon": "grocery",
+                "name": "Waterstones",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/IGA": {
+            "shop/books/Libro": {
                 "tags": {
                 "tags": {
-                    "name": "IGA",
-                    "shop": "supermarket"
+                    "name": "Libro",
+                    "shop": "books"
                 },
                 },
-                "name": "IGA",
-                "icon": "grocery",
+                "name": "Libro",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Iceland": {
+            "shop/books/Barnes & Noble": {
                 "tags": {
                 "tags": {
-                    "name": "Iceland",
-                    "shop": "supermarket"
+                    "name": "Barnes & Noble",
+                    "shop": "books"
                 },
                 },
-                "name": "Iceland",
-                "icon": "grocery",
+                "name": "Barnes & Noble",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Intermarche": {
+            "shop/books/Weltbild": {
                 "tags": {
                 "tags": {
-                    "name": "Intermarche",
-                    "shop": "supermarket"
+                    "name": "Weltbild",
+                    "shop": "books"
                 },
                 },
-                "name": "Intermarche",
-                "icon": "grocery",
+                "name": "Weltbild",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Interspar": {
+            "shop/books/Thalia": {
                 "tags": {
                 "tags": {
-                    "name": "Interspar",
-                    "shop": "supermarket"
+                    "name": "Thalia",
+                    "shop": "books"
                 },
                 },
-                "name": "Interspar",
-                "icon": "grocery",
+                "name": "Thalia",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Irma": {
+            "shop/books/Книги": {
                 "tags": {
                 "tags": {
-                    "name": "Irma",
-                    "shop": "supermarket"
+                    "name": "Книги",
+                    "shop": "books"
                 },
                 },
-                "name": "Irma",
-                "icon": "grocery",
+                "name": "Книги",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Jumbo": {
+            "shop/alcohol/Alko": {
                 "tags": {
                 "tags": {
-                    "name": "Jumbo",
-                    "shop": "supermarket"
+                    "name": "Alko",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "Jumbo",
-                "icon": "grocery",
+                "name": "Alko",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/K+K": {
+            "shop/alcohol/The Beer Store": {
                 "tags": {
                 "tags": {
-                    "name": "K+K",
-                    "shop": "supermarket"
+                    "name": "The Beer Store",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "K+K",
-                "icon": "grocery",
+                "name": "The Beer Store",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kaiser's": {
+            "shop/alcohol/Systembolaget": {
                 "tags": {
                 "tags": {
-                    "name": "Kaiser's",
-                    "shop": "supermarket"
+                    "name": "Systembolaget",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "Kaiser's",
-                "icon": "grocery",
+                "name": "Systembolaget",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kaufland": {
+            "shop/alcohol/LCBO": {
                 "tags": {
                 "tags": {
-                    "name": "Kaufland",
-                    "shop": "supermarket"
+                    "name": "LCBO",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "Kaufland",
-                "icon": "grocery",
+                "name": "LCBO",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kaufpark": {
+            "shop/alcohol/Ароматный мир": {
                 "tags": {
                 "tags": {
-                    "name": "Kaufpark",
-                    "shop": "supermarket"
+                    "name": "Ароматный мир",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "Kaufpark",
-                "icon": "grocery",
+                "name": "Ароматный мир",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/King Soopers": {
+            "shop/alcohol/Bargain Booze": {
                 "tags": {
                 "tags": {
-                    "name": "King Soopers",
-                    "shop": "supermarket"
+                    "name": "Bargain Booze",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "King Soopers",
-                "icon": "grocery",
+                "name": "Bargain Booze",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kiwi": {
+            "shop/alcohol/Nicolas": {
                 "tags": {
                 "tags": {
-                    "name": "Kiwi",
-                    "shop": "supermarket"
+                    "name": "Nicolas",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "Kiwi",
-                "icon": "grocery",
+                "name": "Nicolas",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Konsum": {
+            "shop/alcohol/Botilleria": {
                 "tags": {
                 "tags": {
-                    "name": "Konsum",
-                    "shop": "supermarket"
+                    "name": "Botilleria",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "Konsum",
-                "icon": "grocery",
+                "name": "Botilleria",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kroger": {
+            "shop/alcohol/SAQ": {
                 "tags": {
                 "tags": {
-                    "name": "Kroger",
-                    "shop": "supermarket"
+                    "name": "SAQ",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "Kroger",
-                "icon": "grocery",
+                "name": "SAQ",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Kvickly": {
+            "shop/alcohol/Gall & Gall": {
                 "tags": {
                 "tags": {
-                    "name": "Kvickly",
-                    "shop": "supermarket"
+                    "name": "Gall & Gall",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "Kvickly",
-                "icon": "grocery",
+                "name": "Gall & Gall",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/LIDL": {
+            "shop/alcohol/BWS": {
                 "tags": {
                 "tags": {
-                    "name": "LIDL",
-                    "shop": "supermarket"
+                    "name": "BWS",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "LIDL",
-                "icon": "grocery",
+                "name": "BWS",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Leader Price": {
+            "shop/alcohol/Живое пиво": {
                 "tags": {
                 "tags": {
-                    "name": "Leader Price",
-                    "shop": "supermarket"
+                    "name": "Живое пиво",
+                    "shop": "alcohol"
                 },
                 },
-                "name": "Leader Price",
-                "icon": "grocery",
+                "name": "Живое пиво",
+                "icon": "alcohol-shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Leclerc": {
+            "shop/bakery/Kamps": {
                 "tags": {
                 "tags": {
-                    "name": "Leclerc",
-                    "shop": "supermarket"
+                    "name": "Kamps",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Leclerc",
-                "icon": "grocery",
+                "name": "Kamps",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Lider": {
+            "shop/bakery/Bäckerei Schmidt": {
                 "tags": {
                 "tags": {
-                    "name": "Lider",
-                    "shop": "supermarket"
+                    "name": "Bäckerei Schmidt",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Lider",
-                "icon": "grocery",
+                "name": "Bäckerei Schmidt",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Lidl": {
+            "shop/bakery/Anker": {
                 "tags": {
                 "tags": {
-                    "name": "Lidl",
-                    "shop": "supermarket"
+                    "name": "Anker",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Lidl",
-                "icon": "grocery",
+                "name": "Anker",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/M-Preis": {
+            "shop/bakery/Schäfer": {
                 "tags": {
                 "tags": {
-                    "name": "M-Preis",
-                    "shop": "supermarket"
+                    "name": "Schäfer",
+                    "shop": "bakery"
                 },
                 },
-                "name": "M-Preis",
-                "icon": "grocery",
+                "name": "Schäfer",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/MPreis": {
+            "shop/bakery/Hofpfisterei": {
                 "tags": {
                 "tags": {
-                    "name": "MPreis",
-                    "shop": "supermarket"
+                    "name": "Hofpfisterei",
+                    "shop": "bakery"
                 },
                 },
-                "name": "MPreis",
-                "icon": "grocery",
+                "name": "Hofpfisterei",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Makro": {
+            "shop/bakery/Greggs": {
                 "tags": {
                 "tags": {
-                    "name": "Makro",
-                    "shop": "supermarket"
+                    "name": "Greggs",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Makro",
-                "icon": "grocery",
+                "name": "Greggs",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Markant": {
+            "shop/bakery/Oebel": {
                 "tags": {
                 "tags": {
-                    "name": "Markant",
-                    "shop": "supermarket"
+                    "name": "Oebel",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Markant",
-                "icon": "grocery",
+                "name": "Oebel",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Marktkauf": {
+            "shop/bakery/Boulangerie": {
                 "tags": {
                 "tags": {
-                    "name": "Marktkauf",
-                    "shop": "supermarket"
+                    "name": "Boulangerie",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Marktkauf",
-                "icon": "grocery",
+                "name": "Boulangerie",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Match": {
+            "shop/bakery/Stadtbäckerei": {
                 "tags": {
                 "tags": {
-                    "name": "Match",
-                    "shop": "supermarket"
+                    "name": "Stadtbäckerei",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Match",
-                "icon": "grocery",
+                "name": "Stadtbäckerei",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Maxi": {
+            "shop/bakery/Steinecke": {
                 "tags": {
                 "tags": {
-                    "name": "Maxi",
-                    "shop": "supermarket"
+                    "name": "Steinecke",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Maxi",
-                "icon": "grocery",
+                "name": "Steinecke",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Maxima": {
+            "shop/bakery/Ihle": {
                 "tags": {
                 "tags": {
-                    "name": "Maxima",
-                    "shop": "supermarket"
+                    "name": "Ihle",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Maxima",
-                "icon": "grocery",
+                "name": "Ihle",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Maxima X": {
+            "shop/bakery/Goldilocks": {
                 "tags": {
                 "tags": {
-                    "name": "Maxima X",
-                    "shop": "supermarket"
+                    "name": "Goldilocks",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Maxima X",
-                "icon": "grocery",
+                "name": "Goldilocks",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Meijer": {
+            "shop/bakery/Dat Backhus": {
                 "tags": {
                 "tags": {
-                    "name": "Meijer",
-                    "shop": "supermarket"
+                    "name": "Dat Backhus",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Meijer",
-                "icon": "grocery",
+                "name": "Dat Backhus",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Mercadona": {
+            "shop/bakery/K&U": {
                 "tags": {
                 "tags": {
-                    "name": "Mercadona",
-                    "shop": "supermarket"
+                    "name": "K&U",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Mercadona",
-                "icon": "grocery",
+                "name": "K&U",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Merkur": {
+            "shop/bakery/Der Beck": {
                 "tags": {
                 "tags": {
-                    "name": "Merkur",
-                    "shop": "supermarket"
+                    "name": "Der Beck",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Merkur",
-                "icon": "grocery",
+                "name": "Der Beck",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Metro": {
+            "shop/bakery/Thürmann": {
                 "tags": {
                 "tags": {
-                    "name": "Metro",
-                    "shop": "supermarket"
+                    "name": "Thürmann",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Metro",
-                "icon": "grocery",
+                "name": "Thürmann",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Migros": {
+            "shop/bakery/Backwerk": {
                 "tags": {
                 "tags": {
-                    "name": "Migros",
-                    "shop": "supermarket"
+                    "name": "Backwerk",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Migros",
-                "icon": "grocery",
+                "name": "Backwerk",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Minipreço": {
+            "shop/bakery/Bäcker": {
                 "tags": {
                 "tags": {
-                    "name": "Minipreço",
-                    "shop": "supermarket"
+                    "name": "Bäcker",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Minipreço",
-                "icon": "grocery",
+                "name": "Bäcker",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Monoprix": {
+            "shop/bakery/Schäfer's": {
                 "tags": {
                 "tags": {
-                    "name": "Monoprix",
-                    "shop": "supermarket"
+                    "name": "Schäfer's",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Monoprix",
-                "icon": "grocery",
+                "name": "Schäfer's",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Netto": {
+            "shop/bakery/Panaderia": {
                 "tags": {
                 "tags": {
-                    "name": "Netto",
-                    "shop": "supermarket"
+                    "name": "Panaderia",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Netto",
-                "icon": "grocery",
+                "name": "Panaderia",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/NORMA": {
+            "shop/bakery/Goeken backen": {
                 "tags": {
                 "tags": {
-                    "name": "NORMA",
-                    "shop": "supermarket"
+                    "name": "Goeken backen",
+                    "shop": "bakery"
                 },
                 },
-                "name": "NORMA",
-                "icon": "grocery",
+                "name": "Goeken backen",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/NP": {
+            "shop/bakery/Stadtbäckerei Junge": {
                 "tags": {
                 "tags": {
-                    "name": "NP",
-                    "shop": "supermarket"
+                    "name": "Stadtbäckerei Junge",
+                    "shop": "bakery"
                 },
                 },
-                "name": "NP",
-                "icon": "grocery",
+                "name": "Stadtbäckerei Junge",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Nah & Frisch": {
+            "shop/bakery/Boulangerie Patisserie": {
                 "tags": {
                 "tags": {
-                    "name": "Nah & Frisch",
-                    "shop": "supermarket"
+                    "name": "Boulangerie Patisserie",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Nah & Frisch",
-                "icon": "grocery",
+                "name": "Boulangerie Patisserie",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Nahkauf": {
+            "shop/bakery/Paul": {
                 "tags": {
                 "tags": {
-                    "name": "Nahkauf",
-                    "shop": "supermarket"
+                    "name": "Paul",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Nahkauf",
-                "icon": "grocery",
+                "name": "Paul",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Neukauf": {
+            "shop/bakery/Хлеб": {
                 "tags": {
                 "tags": {
-                    "name": "Neukauf",
-                    "shop": "supermarket"
+                    "name": "Хлеб",
+                    "shop": "bakery"
                 },
                 },
-                "name": "Neukauf",
-                "icon": "grocery",
+                "name": "Хлеб",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/New World": {
+            "shop/bakery/Piekarnia": {
                 "tags": {
                 "tags": {
-                    "name": "New World",
-                    "shop": "supermarket"
+                    "name": "Piekarnia",
+                    "shop": "bakery"
                 },
                 },
-                "name": "New World",
-                "icon": "grocery",
+                "name": "Piekarnia",
+                "icon": "bakery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/No Frills": {
+            "shop/sports/Sports Direct": {
                 "tags": {
                 "tags": {
-                    "name": "No Frills",
-                    "shop": "supermarket"
+                    "name": "Sports Direct",
+                    "shop": "sports"
                 },
                 },
-                "name": "No Frills",
-                "icon": "grocery",
+                "name": "Sports Direct",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Norma": {
+            "shop/sports/Decathlon": {
                 "tags": {
                 "tags": {
-                    "name": "Norma",
-                    "shop": "supermarket"
+                    "name": "Decathlon",
+                    "shop": "sports"
                 },
                 },
-                "name": "Norma",
-                "icon": "grocery",
+                "name": "Decathlon",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/PENNY": {
+            "shop/sports/Intersport": {
                 "tags": {
                 "tags": {
-                    "name": "PENNY",
-                    "shop": "supermarket"
+                    "name": "Intersport",
+                    "shop": "sports"
                 },
                 },
-                "name": "PENNY",
-                "icon": "grocery",
+                "name": "Intersport",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Pam": {
+            "shop/sports/Sports Authority": {
                 "tags": {
                 "tags": {
-                    "name": "Pam",
-                    "shop": "supermarket"
+                    "name": "Sports Authority",
+                    "shop": "sports"
                 },
                 },
-                "name": "Pam",
-                "icon": "grocery",
+                "name": "Sports Authority",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Penny": {
+            "shop/sports/Спортмастер": {
                 "tags": {
                 "tags": {
-                    "name": "Penny",
-                    "shop": "supermarket"
+                    "name": "Спортмастер",
+                    "shop": "sports"
                 },
                 },
-                "name": "Penny",
-                "icon": "grocery",
+                "name": "Спортмастер",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Penny Market": {
+            "shop/sports/Sport 2000": {
                 "tags": {
                 "tags": {
-                    "name": "Penny Market",
-                    "shop": "supermarket"
+                    "name": "Sport 2000",
+                    "shop": "sports"
                 },
                 },
-                "name": "Penny Market",
-                "icon": "grocery",
+                "name": "Sport 2000",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Penny Markt": {
+            "shop/sports/Dick's Sporting Goods": {
                 "tags": {
                 "tags": {
-                    "name": "Penny Markt",
-                    "shop": "supermarket"
+                    "name": "Dick's Sporting Goods",
+                    "shop": "sports"
                 },
                 },
-                "name": "Penny Markt",
-                "icon": "grocery",
+                "name": "Dick's Sporting Goods",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Pick n Pay": {
-                "tags": {
-                    "name": "Pick n Pay",
-                    "shop": "supermarket"
+            "shop/variety_store/Tedi": {
+                "tags": {
+                    "name": "Tedi",
+                    "shop": "variety_store"
                 },
                 },
-                "name": "Pick n Pay",
-                "icon": "grocery",
+                "name": "Tedi",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Piggly Wiggly": {
+            "shop/variety_store/Dollarama": {
                 "tags": {
                 "tags": {
-                    "name": "Piggly Wiggly",
-                    "shop": "supermarket"
+                    "name": "Dollarama",
+                    "shop": "variety_store"
                 },
                 },
-                "name": "Piggly Wiggly",
-                "icon": "grocery",
+                "name": "Dollarama",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Pingo Doce": {
+            "shop/variety_store/Dollar Tree": {
                 "tags": {
                 "tags": {
-                    "name": "Pingo Doce",
-                    "shop": "supermarket"
+                    "name": "Dollar Tree",
+                    "shop": "variety_store"
                 },
                 },
-                "name": "Pingo Doce",
-                "icon": "grocery",
+                "name": "Dollar Tree",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Piotr i Paweł": {
+            "shop/pet/PetSmart": {
                 "tags": {
                 "tags": {
-                    "name": "Piotr i Paweł",
-                    "shop": "supermarket"
+                    "name": "PetSmart",
+                    "shop": "pet"
                 },
                 },
-                "name": "Piotr i Paweł",
-                "icon": "grocery",
+                "name": "PetSmart",
+                "icon": "dog-park",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Plodine": {
+            "shop/pet/Das Futterhaus": {
                 "tags": {
                 "tags": {
-                    "name": "Plodine",
-                    "shop": "supermarket"
+                    "name": "Das Futterhaus",
+                    "shop": "pet"
                 },
                 },
-                "name": "Plodine",
-                "icon": "grocery",
+                "name": "Das Futterhaus",
+                "icon": "dog-park",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Plus": {
+            "shop/pet/Pets at Home": {
                 "tags": {
                 "tags": {
-                    "name": "Plus",
-                    "shop": "supermarket"
+                    "name": "Pets at Home",
+                    "shop": "pet"
                 },
                 },
-                "name": "Plus",
-                "icon": "grocery",
+                "name": "Pets at Home",
+                "icon": "dog-park",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Polo Market": {
+            "shop/pet/Petco": {
                 "tags": {
                 "tags": {
-                    "name": "Polo Market",
-                    "shop": "supermarket"
+                    "name": "Petco",
+                    "shop": "pet"
                 },
                 },
-                "name": "Polo Market",
-                "icon": "grocery",
+                "name": "Petco",
+                "icon": "dog-park",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Price Chopper": {
+            "shop/pet/Зоомагазин": {
                 "tags": {
                 "tags": {
-                    "name": "Price Chopper",
-                    "shop": "supermarket"
+                    "name": "Зоомагазин",
+                    "shop": "pet"
                 },
                 },
-                "name": "Price Chopper",
-                "icon": "grocery",
+                "name": "Зоомагазин",
+                "icon": "dog-park",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Profi": {
+            "shop/shoes/Reno": {
                 "tags": {
                 "tags": {
-                    "name": "Profi",
-                    "shop": "supermarket"
+                    "name": "Reno",
+                    "shop": "shoes"
                 },
                 },
-                "name": "Profi",
-                "icon": "grocery",
+                "name": "Reno",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Publix": {
+            "shop/shoes/Ecco": {
                 "tags": {
                 "tags": {
-                    "name": "Publix",
-                    "shop": "supermarket"
+                    "name": "Ecco",
+                    "shop": "shoes"
                 },
                 },
-                "name": "Publix",
-                "icon": "grocery",
+                "name": "Ecco",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/REWE": {
+            "shop/shoes/Clarks": {
                 "tags": {
                 "tags": {
-                    "name": "REWE",
-                    "shop": "supermarket"
+                    "name": "Clarks",
+                    "shop": "shoes"
                 },
                 },
-                "name": "REWE",
-                "icon": "grocery",
+                "name": "Clarks",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Real": {
+            "shop/shoes/La Halle aux Chaussures": {
                 "tags": {
                 "tags": {
-                    "name": "Real",
-                    "shop": "supermarket"
+                    "name": "La Halle aux Chaussures",
+                    "shop": "shoes"
                 },
                 },
-                "name": "Real",
-                "icon": "grocery",
+                "name": "La Halle aux Chaussures",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Reliance Fresh": {
+            "shop/shoes/Brantano": {
                 "tags": {
                 "tags": {
-                    "name": "Reliance Fresh",
-                    "shop": "supermarket"
+                    "name": "Brantano",
+                    "shop": "shoes"
                 },
                 },
-                "name": "Reliance Fresh",
-                "icon": "grocery",
+                "name": "Brantano",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Rema 1000": {
+            "shop/shoes/Salamander": {
                 "tags": {
                 "tags": {
-                    "name": "Rema 1000",
-                    "shop": "supermarket"
+                    "name": "Salamander",
+                    "shop": "shoes"
                 },
                 },
-                "name": "Rema 1000",
-                "icon": "grocery",
+                "name": "Salamander",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Rewe": {
+            "shop/shoes/Обувь": {
                 "tags": {
                 "tags": {
-                    "name": "Rewe",
-                    "shop": "supermarket"
+                    "name": "Обувь",
+                    "shop": "shoes"
                 },
                 },
-                "name": "Rewe",
-                "icon": "grocery",
+                "name": "Обувь",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Rimi": {
+            "shop/shoes/Payless Shoe Source": {
                 "tags": {
                 "tags": {
-                    "name": "Rimi",
-                    "shop": "supermarket"
+                    "name": "Payless Shoe Source",
+                    "shop": "shoes"
                 },
                 },
-                "name": "Rimi",
-                "icon": "grocery",
+                "name": "Payless Shoe Source",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/S-Market": {
+            "shop/shoes/Famous Footwear": {
                 "tags": {
                 "tags": {
-                    "name": "S-Market",
-                    "shop": "supermarket"
+                    "name": "Famous Footwear",
+                    "shop": "shoes"
                 },
                 },
-                "name": "S-Market",
-                "icon": "grocery",
+                "name": "Famous Footwear",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Safeway": {
+            "shop/shoes/Quick Schuh": {
                 "tags": {
                 "tags": {
-                    "name": "Safeway",
-                    "shop": "supermarket"
+                    "name": "Quick Schuh",
+                    "shop": "shoes"
                 },
                 },
-                "name": "Safeway",
-                "icon": "grocery",
+                "name": "Quick Schuh",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Sam's Club": {
+            "shop/shoes/Foot Locker": {
                 "tags": {
                 "tags": {
-                    "name": "Sam's Club",
-                    "shop": "supermarket"
+                    "name": "Foot Locker",
+                    "shop": "shoes"
                 },
                 },
-                "name": "Sam's Club",
-                "icon": "grocery",
+                "name": "Foot Locker",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Santa Isabel": {
+            "shop/shoes/Bata": {
                 "tags": {
                 "tags": {
-                    "name": "Santa Isabel",
-                    "shop": "supermarket"
+                    "name": "Bata",
+                    "shop": "shoes"
                 },
                 },
-                "name": "Santa Isabel",
-                "icon": "grocery",
+                "name": "Bata",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Shopi": {
+            "shop/toys/La Grande Récré": {
                 "tags": {
                 "tags": {
-                    "name": "Shopi",
-                    "shop": "supermarket"
+                    "name": "La Grande Récré",
+                    "shop": "toys"
                 },
                 },
-                "name": "Shopi",
-                "icon": "grocery",
+                "name": "La Grande Récré",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Shoprite": {
+            "shop/toys/Toys R Us": {
                 "tags": {
                 "tags": {
-                    "name": "Shoprite",
-                    "shop": "supermarket"
+                    "name": "Toys R Us",
+                    "shop": "toys"
                 },
                 },
-                "name": "Shoprite",
-                "icon": "grocery",
+                "name": "Toys R Us",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Simply Market": {
+            "shop/toys/Детский мир": {
                 "tags": {
                 "tags": {
-                    "name": "Simply Market",
-                    "shop": "supermarket"
+                    "name": "Детский мир",
+                    "shop": "toys"
                 },
                 },
-                "name": "Simply Market",
-                "icon": "grocery",
+                "name": "Детский мир",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Sobeys": {
+            "shop/toys/Intertoys": {
                 "tags": {
                 "tags": {
-                    "name": "Sobeys",
-                    "shop": "supermarket"
+                    "name": "Intertoys",
+                    "shop": "toys"
                 },
                 },
-                "name": "Sobeys",
-                "icon": "grocery",
+                "name": "Intertoys",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Soriana": {
+            "shop/toys/Игрушки": {
                 "tags": {
                 "tags": {
-                    "name": "Soriana",
-                    "shop": "supermarket"
+                    "name": "Игрушки",
+                    "shop": "toys"
                 },
                 },
-                "name": "Soriana",
-                "icon": "grocery",
+                "name": "Игрушки",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Stokrotka": {
+            "shop/travel_agency/Flight Centre": {
                 "tags": {
                 "tags": {
-                    "name": "Stokrotka",
-                    "shop": "supermarket"
+                    "name": "Flight Centre",
+                    "shop": "travel_agency"
                 },
                 },
-                "name": "Stokrotka",
-                "icon": "grocery",
+                "name": "Flight Centre",
+                "icon": "suitcase",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Stop & Shop": {
+            "shop/travel_agency/Thomas Cook": {
                 "tags": {
                 "tags": {
-                    "name": "Stop & Shop",
-                    "shop": "supermarket"
+                    "name": "Thomas Cook",
+                    "shop": "travel_agency"
                 },
                 },
-                "name": "Stop & Shop",
-                "icon": "grocery",
+                "name": "Thomas Cook",
+                "icon": "suitcase",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Super Brugsen": {
+            "shop/jewelry/Bijou Brigitte": {
                 "tags": {
                 "tags": {
-                    "name": "Super Brugsen",
-                    "shop": "supermarket"
+                    "name": "Bijou Brigitte",
+                    "shop": "jewelry"
                 },
                 },
-                "name": "Super Brugsen",
-                "icon": "grocery",
+                "name": "Bijou Brigitte",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/SuperBrugsen": {
+            "shop/jewelry/Christ": {
                 "tags": {
                 "tags": {
-                    "name": "SuperBrugsen",
-                    "shop": "supermarket"
+                    "name": "Christ",
+                    "shop": "jewelry"
                 },
                 },
-                "name": "SuperBrugsen",
-                "icon": "grocery",
+                "name": "Christ",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/tegut": {
+            "shop/jewelry/Swarovski": {
                 "tags": {
                 "tags": {
-                    "name": "tegut",
-                    "shop": "supermarket"
+                    "name": "Swarovski",
+                    "shop": "jewelry"
                 },
                 },
-                "name": "tegut",
-                "icon": "grocery",
+                "name": "Swarovski",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Tengelmann": {
+            "shop/optician/Fielmann": {
                 "tags": {
                 "tags": {
-                    "name": "Tengelmann",
-                    "shop": "supermarket"
+                    "name": "Fielmann",
+                    "shop": "optician"
                 },
                 },
-                "name": "Tengelmann",
-                "icon": "grocery",
+                "name": "Fielmann",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Tesco Extra": {
+            "shop/optician/Apollo Optik": {
                 "tags": {
                 "tags": {
-                    "name": "Tesco Extra",
-                    "shop": "supermarket"
+                    "name": "Apollo Optik",
+                    "shop": "optician"
                 },
                 },
-                "name": "Tesco Extra",
-                "icon": "grocery",
+                "name": "Apollo Optik",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Tesco Metro": {
+            "shop/optician/Vision Express": {
                 "tags": {
                 "tags": {
-                    "name": "Tesco Metro",
-                    "shop": "supermarket"
+                    "name": "Vision Express",
+                    "shop": "optician"
                 },
                 },
-                "name": "Tesco Metro",
-                "icon": "grocery",
+                "name": "Vision Express",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/The Co-operative": {
+            "shop/optician/Оптика": {
                 "tags": {
                 "tags": {
-                    "name": "The Co-operative",
-                    "shop": "supermarket"
+                    "name": "Оптика",
+                    "shop": "optician"
                 },
                 },
-                "name": "The Co-operative",
-                "icon": "grocery",
+                "name": "Оптика",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Trader Joe's": {
+            "shop/optician/Optic 2000": {
                 "tags": {
                 "tags": {
-                    "name": "Trader Joe's",
-                    "shop": "supermarket"
+                    "name": "Optic 2000",
+                    "shop": "optician"
                 },
                 },
-                "name": "Trader Joe's",
-                "icon": "grocery",
+                "name": "Optic 2000",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Treff 3000": {
+            "shop/optician/Alain Afflelou": {
                 "tags": {
                 "tags": {
-                    "name": "Treff 3000",
-                    "shop": "supermarket"
+                    "name": "Alain Afflelou",
+                    "shop": "optician"
                 },
                 },
-                "name": "Treff 3000",
-                "icon": "grocery",
+                "name": "Alain Afflelou",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Unimarc": {
+            "shop/optician/Specsavers": {
                 "tags": {
                 "tags": {
-                    "name": "Unimarc",
-                    "shop": "supermarket"
+                    "name": "Specsavers",
+                    "shop": "optician"
                 },
                 },
-                "name": "Unimarc",
-                "icon": "grocery",
+                "name": "Specsavers",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Unimarkt": {
+            "shop/optician/Krys": {
                 "tags": {
                 "tags": {
-                    "name": "Unimarkt",
-                    "shop": "supermarket"
+                    "name": "Krys",
+                    "shop": "optician"
                 },
                 },
-                "name": "Unimarkt",
-                "icon": "grocery",
+                "name": "Krys",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Waitrose": {
+            "shop/optician/Atol": {
                 "tags": {
                 "tags": {
-                    "name": "Waitrose",
-                    "shop": "supermarket"
+                    "name": "Atol",
+                    "shop": "optician"
                 },
                 },
-                "name": "Waitrose",
-                "icon": "grocery",
+                "name": "Atol",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Wasgau": {
+            "shop/video/Blockbuster": {
                 "tags": {
                 "tags": {
-                    "name": "Wasgau",
-                    "shop": "supermarket"
+                    "name": "Blockbuster",
+                    "shop": "video"
                 },
                 },
-                "name": "Wasgau",
-                "icon": "grocery",
+                "name": "Blockbuster",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Whole Foods": {
+            "shop/video/World of Video": {
                 "tags": {
                 "tags": {
-                    "name": "Whole Foods",
-                    "shop": "supermarket"
+                    "name": "World of Video",
+                    "shop": "video"
                 },
                 },
-                "name": "Whole Foods",
-                "icon": "grocery",
+                "name": "World of Video",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Willys": {
+            "shop/mobile_phone/Билайн": {
                 "tags": {
                 "tags": {
-                    "name": "Willys",
-                    "shop": "supermarket"
+                    "name": "Билайн",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Willys",
-                "icon": "grocery",
+                "name": "Билайн",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Zielpunkt": {
+            "shop/mobile_phone/ソフトバンクショップ (SoftBank shop)": {
                 "tags": {
                 "tags": {
-                    "name": "Zielpunkt",
-                    "shop": "supermarket"
+                    "name": "ソフトバンクショップ (SoftBank shop)",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Zielpunkt",
-                "icon": "grocery",
+                "name": "ソフトバンクショップ (SoftBank shop)",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/coop": {
+            "shop/mobile_phone/Vodafone": {
                 "tags": {
                 "tags": {
-                    "name": "coop",
-                    "shop": "supermarket"
+                    "name": "Vodafone",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "coop",
-                "icon": "grocery",
+                "name": "Vodafone",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/nahkauf": {
+            "shop/mobile_phone/O2": {
                 "tags": {
                 "tags": {
-                    "name": "nahkauf",
-                    "shop": "supermarket"
+                    "name": "O2",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "nahkauf",
-                "icon": "grocery",
+                "name": "O2",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/real,-": {
+            "shop/mobile_phone/Carphone Warehouse": {
                 "tags": {
                 "tags": {
-                    "name": "real,-",
-                    "shop": "supermarket"
+                    "name": "Carphone Warehouse",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "real,-",
-                "icon": "grocery",
+                "name": "Carphone Warehouse",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/sky": {
+            "shop/mobile_phone/Orange": {
                 "tags": {
                 "tags": {
-                    "name": "sky",
-                    "shop": "supermarket"
+                    "name": "Orange",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "sky",
-                "icon": "grocery",
+                "name": "Orange",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/АТБ": {
+            "shop/mobile_phone/Verizon Wireless": {
                 "tags": {
                 "tags": {
-                    "name": "АТБ",
-                    "shop": "supermarket"
+                    "name": "Verizon Wireless",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "АТБ",
-                "icon": "grocery",
+                "name": "Verizon Wireless",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Десяточка": {
+            "shop/mobile_phone/Sprint": {
                 "tags": {
                 "tags": {
-                    "name": "Десяточка",
-                    "shop": "supermarket"
+                    "name": "Sprint",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Десяточка",
-                "icon": "grocery",
+                "name": "Sprint",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Евроопт": {
+            "shop/mobile_phone/T-Mobile": {
                 "tags": {
                 "tags": {
-                    "name": "Евроопт",
-                    "shop": "supermarket"
+                    "name": "T-Mobile",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Евроопт",
-                "icon": "grocery",
+                "name": "T-Mobile",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Карусель": {
+            "shop/mobile_phone/МТС": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\9aаÑ\80Ñ\83Ñ\81елÑ\8c",
-                    "shop": "supermarket"
+                    "name": "Ð\9cТС",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Ð\9aаÑ\80Ñ\83Ñ\81елÑ\8c",
-                "icon": "grocery",
+                "name": "Ð\9cТС",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Квартал": {
+            "shop/mobile_phone/Евросеть": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\9aваÑ\80Ñ\82ал",
-                    "shop": "supermarket"
+                    "name": "Ð\95вÑ\80оÑ\81еÑ\82Ñ\8c",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Ð\9aваÑ\80Ñ\82ал",
-                "icon": "grocery",
+                "name": "Ð\95вÑ\80оÑ\81еÑ\82Ñ\8c",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Копейка": {
+            "shop/mobile_phone/Bell": {
                 "tags": {
                 "tags": {
-                    "name": "Копейка",
-                    "shop": "supermarket"
+                    "name": "Bell",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Копейка",
-                "icon": "grocery",
+                "name": "Bell",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Магнолия": {
+            "shop/mobile_phone/The Phone House": {
                 "tags": {
                 "tags": {
-                    "name": "Магнолия",
-                    "shop": "supermarket"
+                    "name": "The Phone House",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Магнолия",
-                "icon": "grocery",
+                "name": "The Phone House",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Народная 7Я семьЯ": {
+            "shop/mobile_phone/SFR": {
                 "tags": {
                 "tags": {
-                    "name": "Народная 7Я семьЯ",
-                    "shop": "supermarket"
+                    "name": "SFR",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Народная 7Я семьЯ",
-                "icon": "grocery",
+                "name": "SFR",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Полушка": {
+            "shop/mobile_phone/Связной": {
                 "tags": {
                 "tags": {
-                    "name": "Ð\9fолÑ\83Ñ\88ка",
-                    "shop": "supermarket"
+                    "name": "СвÑ\8fзной",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Ð\9fолÑ\83Ñ\88ка",
-                "icon": "grocery",
+                "name": "СвÑ\8fзной",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Седьмой континент": {
+            "shop/mobile_phone/Мегафон": {
                 "tags": {
                 "tags": {
-                    "name": "СедÑ\8cмой ÐºÐ¾Ð½Ñ\82иненÑ\82",
-                    "shop": "supermarket"
+                    "name": "Ð\9cегаÑ\84он",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "СедÑ\8cмой ÐºÐ¾Ð½Ñ\82иненÑ\82",
-                "icon": "grocery",
+                "name": "Ð\9cегаÑ\84он",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Семья": {
+            "shop/mobile_phone/AT&T": {
                 "tags": {
                 "tags": {
-                    "name": "Семья",
-                    "shop": "supermarket"
+                    "name": "AT&T",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Семья",
-                "icon": "grocery",
+                "name": "AT&T",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Сільпо": {
+            "shop/mobile_phone/ドコモショップ (docomo shop)": {
                 "tags": {
                 "tags": {
-                    "name": "Сільпо",
-                    "shop": "supermarket"
+                    "name": "ドコモショップ (docomo shop)",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Сільпо",
-                "icon": "grocery",
+                "name": "ドコモショップ (docomo shop)",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Фора": {
+            "shop/mobile_phone/au": {
                 "tags": {
                 "tags": {
-                    "name": "Фора",
-                    "shop": "supermarket"
+                    "name": "au",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Фора",
-                "icon": "grocery",
+                "name": "au",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Фуршет": {
+            "shop/mobile_phone/Movistar": {
                 "tags": {
                 "tags": {
-                    "name": "Фуршет",
-                    "shop": "supermarket"
+                    "name": "Movistar",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "Фуршет",
-                "icon": "grocery",
+                "name": "Movistar",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/マルエツ": {
+            "shop/mobile_phone/Bitė": {
                 "tags": {
                 "tags": {
-                    "name": "マルエツ",
-                    "shop": "supermarket"
+                    "name": "Bitė",
+                    "shop": "mobile_phone"
                 },
                 },
-                "name": "マルエツ",
-                "icon": "grocery",
+                "name": "Bitė",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/ヨークマート (YorkMart)": {
+            "shop/computer/PC World": {
                 "tags": {
                 "tags": {
-                    "name": "ヨークマート (YorkMart)",
-                    "shop": "supermarket"
+                    "name": "PC World",
+                    "shop": "computer"
                 },
                 },
-                "name": "ヨークマート (YorkMart)",
-                "icon": "grocery",
+                "name": "PC World",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/西友 (SEIYU)": {
+            "shop/computer/DNS": {
                 "tags": {
                 "tags": {
-                    "name": "西友 (SEIYU)",
-                    "shop": "supermarket"
+                    "name": "DNS",
+                    "shop": "computer"
                 },
                 },
-                "name": "西友 (SEIYU)",
-                "icon": "grocery",
+                "name": "DNS",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "fields": [
-                    "operator",
+                    "address",
                     "building_area",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/toys/La Grande Récré": {
+            "shop/hairdresser/Klier": {
                 "tags": {
                 "tags": {
-                    "name": "La Grande Récré",
-                    "shop": "toys"
+                    "name": "Klier",
+                    "shop": "hairdresser"
                 },
                 },
-                "name": "La Grande Récré",
+                "name": "Klier",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93229,12 +97161,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/toys/Toys R Us": {
+            "shop/hairdresser/Supercuts": {
                 "tags": {
                 "tags": {
-                    "name": "Toys R Us",
-                    "shop": "toys"
+                    "name": "Supercuts",
+                    "shop": "hairdresser"
                 },
                 },
-                "name": "Toys R Us",
+                "name": "Supercuts",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93248,12 +97180,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/toys/Детский мир": {
+            "shop/hairdresser/Hairkiller": {
                 "tags": {
                 "tags": {
-                    "name": "Детский мир",
-                    "shop": "toys"
+                    "name": "Hairkiller",
+                    "shop": "hairdresser"
                 },
                 },
-                "name": "Детский мир",
+                "name": "Hairkiller",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93267,13 +97199,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/travel_agency/Flight Centre": {
+            "shop/hairdresser/Great Clips": {
                 "tags": {
                 "tags": {
-                    "name": "Flight Centre",
-                    "shop": "travel_agency"
+                    "name": "Great Clips",
+                    "shop": "hairdresser"
                 },
                 },
-                "name": "Flight Centre",
-                "icon": "suitcase",
+                "name": "Great Clips",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93286,13 +97218,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/travel_agency/Thomas Cook": {
+            "shop/hairdresser/Парикмахерская": {
                 "tags": {
                 "tags": {
-                    "name": "Thomas Cook",
-                    "shop": "travel_agency"
+                    "name": "Парикмахерская",
+                    "shop": "hairdresser"
                 },
                 },
-                "name": "Thomas Cook",
-                "icon": "suitcase",
+                "name": "Парикмахерская",
+                "icon": "shop",
                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93305,12 +97237,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/variety_store/Dollar Tree": {
+            "shop/hairdresser/Fryzjer": {
                 "tags": {
                 "tags": {
-                    "name": "Dollar Tree",
-                    "shop": "variety_store"
+                    "name": "Fryzjer",
+                    "shop": "hairdresser"
                 },
                 },
-                "name": "Dollar Tree",
+                "name": "Fryzjer",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93324,12 +97256,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/variety_store/Dollarama": {
+            "shop/hairdresser/Franck Provost": {
                 "tags": {
                 "tags": {
-                    "name": "Dollarama",
-                    "shop": "variety_store"
+                    "name": "Franck Provost",
+                    "shop": "hairdresser"
                 },
                 },
-                "name": "Dollarama",
+                "name": "Franck Provost",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93343,12 +97275,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/variety_store/Tedi": {
+            "shop/hairdresser/Салон красоты": {
                 "tags": {
                 "tags": {
-                    "name": "Tedi",
-                    "shop": "variety_store"
+                    "name": "Салон красоты",
+                    "shop": "hairdresser"
                 },
                 },
-                "name": "Tedi",
+                "name": "Салон красоты",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93362,12 +97294,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/video/Blockbuster": {
+            "shop/hardware/1000 мелочей": {
                 "tags": {
                 "tags": {
-                    "name": "Blockbuster",
-                    "shop": "video"
+                    "name": "1000 мелочей",
+                    "shop": "hardware"
                 },
                 },
-                "name": "Blockbuster",
+                "name": "1000 мелочей",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93381,12 +97313,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
                 ],
                 "suggestion": true
             },
-            "shop/video/World of Video": {
+            "shop/motorcycle/Yamaha": {
                 "tags": {
                 "tags": {
-                    "name": "World of Video",
-                    "shop": "video"
+                    "name": "Yamaha",
+                    "shop": "motorcycle"
                 },
                 },
-                "name": "World of Video",
+                "name": "Yamaha",
                 "icon": "shop",
                 "geometry": [
                     "point",
                 "icon": "shop",
                 "geometry": [
                     "point",
@@ -93579,7 +97511,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "waterway/river",
                     "waterway/stream",
                     "waterway/canal",
                     "waterway/river",
                     "waterway/stream",
                     "waterway/canal",
-                    "waterway/ditch"
+                    "waterway/ditch",
+                    "waterway/drain"
                 ]
             }
         },
                 ]
             }
         },
@@ -93645,7 +97578,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "address": {
                 "type": "address",
                 "keys": [
             "address": {
                 "type": "address",
                 "keys": [
-                    "addr:housename",
                     "addr:housenumber",
                     "addr:street",
                     "addr:city",
                     "addr:housenumber",
                     "addr:street",
                     "addr:city",
@@ -93656,7 +97588,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "label": "Address",
                 "strings": {
                     "placeholders": {
                 "label": "Address",
                 "strings": {
                     "placeholders": {
-                        "housename": "Housename",
                         "number": "123",
                         "street": "Street",
                         "city": "City",
                         "number": "123",
                         "street": "Street",
                         "city": "City",
@@ -93669,6 +97600,59 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "number",
                 "label": "Admin Level"
             },
                 "type": "number",
                 "label": "Admin Level"
             },
+            "aerialway": {
+                "key": "aerialway",
+                "type": "typeCombo",
+                "label": "Type"
+            },
+            "aerialway/access": {
+                "key": "aerialway:access",
+                "type": "combo",
+                "options": [
+                    "entry",
+                    "exit",
+                    "both"
+                ],
+                "label": "Access"
+            },
+            "aerialway/bubble": {
+                "key": "aerialway:bubble",
+                "type": "check",
+                "label": "Bubble"
+            },
+            "aerialway/capacity": {
+                "key": "aerialway:capacity",
+                "type": "number",
+                "label": "Capacity (per hour)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "key": "aerialway:duration",
+                "type": "number",
+                "label": "Duration (minutes)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "key": "aerialway:heating",
+                "type": "check",
+                "label": "Heated"
+            },
+            "aerialway/occupancy": {
+                "key": "aerialway:occupancy",
+                "type": "number",
+                "label": "Occupancy",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "key": "aerialway:summer:access",
+                "type": "combo",
+                "options": [
+                    "entry",
+                    "exit",
+                    "both"
+                ],
+                "label": "Access (summer)"
+            },
             "aeroway": {
                 "key": "aeroway",
                 "type": "typeCombo",
             "aeroway": {
                 "key": "aeroway",
                 "type": "typeCombo",
@@ -93825,6 +97809,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "textarea",
                 "label": "Description"
             },
                 "type": "textarea",
                 "label": "Description"
             },
+            "electrified": {
+                "key": "electrified",
+                "type": "combo",
+                "label": "Electrification",
+                "options": [
+                    "contact_line",
+                    "rail",
+                    "yes",
+                    "no"
+                ]
+            },
             "elevation": {
                 "key": "ele",
                 "type": "number",
             "elevation": {
                 "key": "ele",
                 "type": "number",
@@ -93869,6 +97864,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "textarea",
                 "label": "Fix Me"
             },
                 "type": "textarea",
                 "label": "Fix Me"
             },
+            "gauge": {
+                "key": "gauge",
+                "type": "combo",
+                "label": "Gauge"
+            },
             "generator/method": {
                 "key": "generator:method",
                 "type": "combo",
             "generator/method": {
                 "key": "generator:method",
                 "type": "combo",
@@ -94087,6 +98087,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "label": "Phone",
                 "placeholder": "+31 42 123 4567"
             },
                 "label": "Phone",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "key": "piste:difficulty",
+                "type": "combo",
+                "label": "Difficulty"
+            },
+            "piste/grooming": {
+                "key": "piste:grooming",
+                "type": "combo",
+                "label": "Grooming"
+            },
+            "piste/type": {
+                "key": "piste:type",
+                "type": "typeCombo",
+                "label": "Type"
+            },
             "place": {
                 "key": "place",
                 "type": "typeCombo",
             "place": {
                 "key": "place",
                 "type": "typeCombo",
@@ -94193,6 +98208,28 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "social_facility_for": {
+                "key": "social_facility:for",
+                "type": "radio",
+                "label": "People served",
+                "placeholder": "Homeless, Disabled, Child, etc",
+                "options": [
+                    "abused",
+                    "child",
+                    "disabled",
+                    "diseased",
+                    "drug_addicted",
+                    "homeless",
+                    "juvenile",
+                    "mental_health",
+                    "migrant",
+                    "orphan",
+                    "senior",
+                    "underprivileged",
+                    "unemployed",
+                    "victim"
+                ]
+            },
             "source": {
                 "key": "source",
                 "type": "text",
             "source": {
                 "key": "source",
                 "type": "text",
@@ -94224,6 +98261,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     }
                 }
             },
                     }
                 }
             },
+            "studio_type": {
+                "key": "type",
+                "type": "combo",
+                "options": [
+                    "audio",
+                    "video"
+                ],
+                "label": "Type"
+            },
             "supervised": {
                 "key": "supervised",
                 "type": "check",
             "supervised": {
                 "key": "supervised",
                 "type": "check",
@@ -94269,6 +98315,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "label": "Type"
             },
                 ],
                 "label": "Type"
             },
+            "tunnel": {
+                "key": "tunnel",
+                "type": "combo",
+                "label": "Tunnel"
+            },
             "vending": {
                 "key": "vending",
                 "type": "combo",
             "vending": {
                 "key": "vending",
                 "type": "combo",
@@ -106164,8 +110215,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
     },
     "locales": [
         "af",
     },
     "locales": [
         "af",
+        "sq",
         "ar",
         "ar-AA",
         "ar",
         "ar-AA",
+        "hy",
         "ast",
         "bn",
         "bs",
         "ast",
         "bn",
         "bs",
@@ -106192,7 +110245,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "id",
         "it",
         "ja",
         "id",
         "it",
         "ja",
+        "kn",
         "ko",
         "ko",
+        "ko-KR",
         "lv",
         "lt",
         "no",
         "lv",
         "lt",
         "no",
@@ -106201,6 +110256,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "pl",
         "pt",
         "pt-BR",
         "pl",
         "pt",
         "pt-BR",
+        "ro-RO",
         "ru",
         "sc",
         "sr",
         "ru",
         "sc",
         "sr",
@@ -106209,6 +110265,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "sl",
         "es",
         "sv",
         "sl",
         "es",
         "sv",
+        "ta",
         "te",
         "tr",
         "uk",
         "te",
         "tr",
         "uk",
@@ -106350,7 +110407,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "annotation": "Merged {n} lines.",
                 "not_eligible": "These features can't be merged.",
                 "not_adjacent": "These lines can't be merged because they aren't connected.",
                 "annotation": "Merged {n} lines.",
                 "not_eligible": "These features can't be merged.",
                 "not_adjacent": "These lines can't be merged because they aren't connected.",
-                "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation."
+                "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.",
+                "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded."
             },
             "move": {
                 "title": "Move",
             },
             "move": {
                 "title": "Move",
@@ -106472,7 +110530,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "yes": "Yes",
                 "no": "No"
             },
                 "yes": "Yes",
                 "no": "No"
             },
-            "none": "None"
+            "none": "None",
+            "node": "Node",
+            "way": "Way",
+            "relation": "Relation",
+            "location": "Location"
         },
         "background": {
             "title": "Background",
         },
         "background": {
             "title": "Background",
@@ -106532,6 +110594,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "untagged_area": "Untagged area",
             "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
             "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
             "untagged_area": "Untagged area",
             "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
             "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
+            "untagged_tooltip": "Select a feature type that describes what this {geometry} is.",
             "deprecated_tags": "Deprecated tags: {tags}"
         },
         "zoom": {
             "deprecated_tags": "Deprecated tags: {tags}"
         },
         "zoom": {
@@ -106547,7 +110610,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         },
         "help": {
             "title": "Help",
         },
         "help": {
             "title": "Help",
-            "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/systemed/iD).\n",
+            "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
             "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a rectangle.\nThis will draw a box and select all the points within it.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n",
             "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also click the 'Move' tool or press the `M` shortcut key to move the entire road at\none time, and then click again to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n",
             "gps": "# GPS\n\nGPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright green\nline. Click on the 'Background Settings' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n",
             "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a rectangle.\nThis will draw a box and select all the points within it.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n",
             "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also click the 'Move' tool or press the `M` shortcut key to move the entire road at\none time, and then click again to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n",
             "gps": "# GPS\n\nGPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright green\nline. Click on the 'Background Settings' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n",
@@ -106680,7 +110743,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "address": {
                     "label": "Address",
                     "placeholders": {
                 "address": {
                     "label": "Address",
                     "placeholders": {
-                        "housename": "Housename",
                         "number": "123",
                         "street": "Street",
                         "city": "City",
                         "number": "123",
                         "street": "Street",
                         "city": "City",
@@ -106690,6 +110752,33 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "admin_level": {
                     "label": "Admin Level"
                 },
                 "admin_level": {
                     "label": "Admin Level"
                 },
+                "aerialway": {
+                    "label": "Type"
+                },
+                "aerialway/access": {
+                    "label": "Access"
+                },
+                "aerialway/bubble": {
+                    "label": "Bubble"
+                },
+                "aerialway/capacity": {
+                    "label": "Capacity (per hour)",
+                    "placeholder": "500, 2500, 5000..."
+                },
+                "aerialway/duration": {
+                    "label": "Duration (minutes)",
+                    "placeholder": "1, 2, 3..."
+                },
+                "aerialway/heating": {
+                    "label": "Heated"
+                },
+                "aerialway/occupancy": {
+                    "label": "Occupancy",
+                    "placeholder": "2, 4, 8..."
+                },
+                "aerialway/summer/access": {
+                    "label": "Access (summer)"
+                },
                 "aeroway": {
                     "label": "Type"
                 },
                 "aeroway": {
                     "label": "Type"
                 },
@@ -106770,6 +110859,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "description": {
                     "label": "Description"
                 },
                 "description": {
                     "label": "Description"
                 },
+                "electrified": {
+                    "label": "Electrification"
+                },
                 "elevation": {
                     "label": "Elevation"
                 },
                 "elevation": {
                     "label": "Elevation"
                 },
@@ -106792,6 +110884,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fixme": {
                     "label": "Fix Me"
                 },
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "gauge": {
+                    "label": "Gauge"
+                },
                 "generator/method": {
                     "label": "Method"
                 },
                 "generator/method": {
                     "label": "Method"
                 },
@@ -106915,6 +111010,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Phone",
                     "placeholder": "+31 42 123 4567"
                 },
                     "label": "Phone",
                     "placeholder": "+31 42 123 4567"
                 },
+                "piste/difficulty": {
+                    "label": "Difficulty"
+                },
+                "piste/grooming": {
+                    "label": "Grooming"
+                },
+                "piste/type": {
+                    "label": "Type"
+                },
                 "place": {
                     "label": "Type"
                 },
                 "place": {
                     "label": "Type"
                 },
@@ -106966,6 +111070,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "shop": {
                     "label": "Type"
                 },
                 "shop": {
                     "label": "Type"
                 },
+                "social_facility_for": {
+                    "label": "People served",
+                    "placeholder": "Homeless, Disabled, Child, etc"
+                },
                 "source": {
                     "label": "Source"
                 },
                 "source": {
                     "label": "Source"
                 },
@@ -106982,6 +111090,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "cutting": "Cutting"
                     }
                 },
                         "cutting": "Cutting"
                     }
                 },
+                "studio_type": {
+                    "label": "Type"
+                },
                 "supervised": {
                     "label": "Supervised"
                 },
                 "supervised": {
                     "label": "Supervised"
                 },
@@ -107006,6 +111117,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "tree_type": {
                     "label": "Type"
                 },
                 "tree_type": {
                     "label": "Type"
                 },
+                "tunnel": {
+                    "label": "Tunnel"
+                },
                 "vending": {
                     "label": "Type of Goods"
                 },
                 "vending": {
                     "label": "Type of Goods"
                 },
@@ -107037,6 +111151,46 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Address",
                     "terms": ""
                 },
                     "name": "Address",
                     "terms": ""
                 },
+                "aerialway": {
+                    "name": "Aerialway",
+                    "terms": "ski lift,funifor,funitel"
+                },
+                "aerialway/cable_car": {
+                    "name": "Cable Car",
+                    "terms": "tramway,ropeway"
+                },
+                "aerialway/chair_lift": {
+                    "name": "Chair Lift",
+                    "terms": ""
+                },
+                "aerialway/gondola": {
+                    "name": "Gondola",
+                    "terms": ""
+                },
+                "aerialway/magic_carpet": {
+                    "name": "Magic Carpet Lift",
+                    "terms": ""
+                },
+                "aerialway/platter": {
+                    "name": "Platter Lift",
+                    "terms": "button lift,poma lift"
+                },
+                "aerialway/pylon": {
+                    "name": "Aerialway Pylon",
+                    "terms": ""
+                },
+                "aerialway/rope_tow": {
+                    "name": "Rope Tow Lift",
+                    "terms": "handle tow,bugel lift"
+                },
+                "aerialway/station": {
+                    "name": "Aerialway Station",
+                    "terms": ""
+                },
+                "aerialway/t-bar": {
+                    "name": "T-bar Lift",
+                    "terms": ""
+                },
                 "aeroway": {
                     "name": "Aeroway",
                     "terms": ""
                 "aeroway": {
                     "name": "Aeroway",
                     "terms": ""
@@ -107133,6 +111287,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Cinema",
                     "terms": "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
                 },
                     "name": "Cinema",
                     "terms": "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
                 },
+                "amenity/clinic": {
+                    "name": "Clinic",
+                    "terms": "clinic,medical clinic"
+                },
+                "amenity/clock": {
+                    "name": "Clock",
+                    "terms": ""
+                },
                 "amenity/college": {
                     "name": "College",
                     "terms": ""
                 "amenity/college": {
                     "name": "College",
                     "terms": ""
@@ -107141,6 +111303,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Courthouse",
                     "terms": ""
                 },
                     "name": "Courthouse",
                     "terms": ""
                 },
+                "amenity/dentist": {
+                    "name": "Dentist",
+                    "terms": "dentist,dentist's office"
+                },
+                "amenity/doctor": {
+                    "name": "Doctor",
+                    "terms": "doctor,doctor's office"
+                },
                 "amenity/drinking_water": {
                     "name": "Drinking Water",
                     "terms": "water fountain,potable water"
                 "amenity/drinking_water": {
                     "name": "Drinking Water",
                     "terms": "water fountain,potable water"
@@ -107249,6 +111419,26 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Shelter",
                     "terms": "lean-to"
                 },
                     "name": "Shelter",
                     "terms": "lean-to"
                 },
+                "amenity/social_facility": {
+                    "name": "Social Facility",
+                    "terms": ""
+                },
+                "amenity/social_facility/food_bank": {
+                    "name": "Food Bank",
+                    "terms": ""
+                },
+                "amenity/social_facility/group_home": {
+                    "name": "Group Home",
+                    "terms": "elderly,old,senior living"
+                },
+                "amenity/social_facility/homeless_shelter": {
+                    "name": "Homeless Shelter",
+                    "terms": "houseless,unhoused,displaced"
+                },
+                "amenity/studio": {
+                    "name": "Studio",
+                    "terms": "recording studio,studio,radio,radio studio,television,television studio"
+                },
                 "amenity/swimming_pool": {
                     "name": "Swimming Pool",
                     "terms": ""
                 "amenity/swimming_pool": {
                     "name": "Swimming Pool",
                     "terms": ""
@@ -107281,6 +111471,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Vending Machine",
                     "terms": ""
                 },
                     "name": "Vending Machine",
                     "terms": ""
                 },
+                "amenity/veterinary": {
+                    "name": "Veterinary",
+                    "terms": "pet clinic,veterinarian,animal hospital,pet doctor"
+                },
                 "amenity/waste_basket": {
                     "name": "Waste Basket",
                     "terms": "rubbish bin,litter bin,trash can,garbage can"
                 "amenity/waste_basket": {
                     "name": "Waste Basket",
                     "terms": "rubbish bin,litter bin,trash can,garbage can"
@@ -107369,10 +111563,46 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Apartments",
                     "terms": ""
                 },
                     "name": "Apartments",
                     "terms": ""
                 },
+                "building/barn": {
+                    "name": "Barn",
+                    "terms": ""
+                },
+                "building/bunker": {
+                    "name": "Bunker",
+                    "terms": ""
+                },
+                "building/cabin": {
+                    "name": "Cabin",
+                    "terms": ""
+                },
+                "building/cathedral": {
+                    "name": "Cathedral",
+                    "terms": ""
+                },
+                "building/chapel": {
+                    "name": "Chapel",
+                    "terms": ""
+                },
+                "building/church": {
+                    "name": "Church",
+                    "terms": ""
+                },
                 "building/commercial": {
                     "name": "Commercial Building",
                     "terms": ""
                 },
                 "building/commercial": {
                     "name": "Commercial Building",
                     "terms": ""
                 },
+                "building/construction": {
+                    "name": "Building Under Construction",
+                    "terms": ""
+                },
+                "building/detached": {
+                    "name": "Detached Home",
+                    "terms": ""
+                },
+                "building/dormitory": {
+                    "name": "Dormitory",
+                    "terms": ""
+                },
                 "building/entrance": {
                     "name": "Entrance",
                     "terms": ""
                 "building/entrance": {
                     "name": "Entrance",
                     "terms": ""
@@ -107381,6 +111611,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Garage",
                     "terms": ""
                 },
                     "name": "Garage",
                     "terms": ""
                 },
+                "building/garages": {
+                    "name": "Garages",
+                    "terms": ""
+                },
+                "building/greenhouse": {
+                    "name": "Greenhouse",
+                    "terms": ""
+                },
+                "building/hospital": {
+                    "name": "Hospital Building",
+                    "terms": ""
+                },
+                "building/hotel": {
+                    "name": "Hotel Building",
+                    "terms": ""
+                },
                 "building/house": {
                     "name": "House",
                     "terms": ""
                 "building/house": {
                     "name": "House",
                     "terms": ""
@@ -107393,10 +111639,234 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Industrial Building",
                     "terms": ""
                 },
                     "name": "Industrial Building",
                     "terms": ""
                 },
+                "building/public": {
+                    "name": "Public Building",
+                    "terms": ""
+                },
                 "building/residential": {
                     "name": "Residential Building",
                     "terms": ""
                 },
                 "building/residential": {
                     "name": "Residential Building",
                     "terms": ""
                 },
+                "building/retail": {
+                    "name": "Retail Building",
+                    "terms": ""
+                },
+                "building/roof": {
+                    "name": "Roof",
+                    "terms": ""
+                },
+                "building/school": {
+                    "name": "School Building",
+                    "terms": ""
+                },
+                "building/shed": {
+                    "name": "Shed",
+                    "terms": ""
+                },
+                "building/stable": {
+                    "name": "Stable",
+                    "terms": ""
+                },
+                "building/static_caravan": {
+                    "name": "Static Mobile Home",
+                    "terms": ""
+                },
+                "building/terrace": {
+                    "name": "Row Houses",
+                    "terms": ""
+                },
+                "building/train_station": {
+                    "name": "Train Station",
+                    "terms": ""
+                },
+                "building/university": {
+                    "name": "University Building",
+                    "terms": ""
+                },
+                "building/warehouse": {
+                    "name": "Warehouse",
+                    "terms": ""
+                },
+                "craft/basket_maker": {
+                    "name": "Basket Maker",
+                    "terms": "basket,basketry,basket maker,basket weaver"
+                },
+                "craft/beekeeper": {
+                    "name": "Beekeeper",
+                    "terms": "bees,beekeeper,bee box"
+                },
+                "craft/blacksmith": {
+                    "name": "Blacksmith",
+                    "terms": "blacksmith"
+                },
+                "craft/boatbuilder": {
+                    "name": "Boat Builder",
+                    "terms": "boat builder"
+                },
+                "craft/bookbinder": {
+                    "name": "Bookbinder",
+                    "terms": "bookbinder,book repair"
+                },
+                "craft/brewery": {
+                    "name": "Brewery",
+                    "terms": "brewery"
+                },
+                "craft/carpenter": {
+                    "name": "Carpenter",
+                    "terms": "carpenter,woodworker"
+                },
+                "craft/carpet_layer": {
+                    "name": "Carpet Layer",
+                    "terms": "carpet layer"
+                },
+                "craft/caterer": {
+                    "name": "Caterer",
+                    "terms": "Caterer,Catering"
+                },
+                "craft/clockmaker": {
+                    "name": "Clockmaker",
+                    "terms": "clock,clockmaker,clock repair"
+                },
+                "craft/confectionary": {
+                    "name": "Confectionary",
+                    "terms": "confectionary,sweets,candy"
+                },
+                "craft/dressmaker": {
+                    "name": "Dressmaker",
+                    "terms": "dress,dressmaker"
+                },
+                "craft/electrician": {
+                    "name": "Electrician",
+                    "terms": "electrician"
+                },
+                "craft/gardener": {
+                    "name": "Gardener",
+                    "terms": "gardener,landscaper,grounds keeper"
+                },
+                "craft/glaziery": {
+                    "name": "Glaziery",
+                    "terms": "glass,glass foundry,stained-glass,window"
+                },
+                "craft/handicraft": {
+                    "name": "Handicraft",
+                    "terms": "handicraft"
+                },
+                "craft/hvac": {
+                    "name": "HVAC",
+                    "terms": "heating,ventilating,air-conditioning,air conditioning"
+                },
+                "craft/insulator": {
+                    "name": "Insulator",
+                    "terms": "insulation,insulator"
+                },
+                "craft/jeweler": {
+                    "name": "Jeweler",
+                    "terms": "jeweler,gem,diamond"
+                },
+                "craft/key_cutter": {
+                    "name": "Key Cutter",
+                    "terms": "key,key cutter"
+                },
+                "craft/locksmith": {
+                    "name": "Locksmith",
+                    "terms": "locksmith,lock"
+                },
+                "craft/metal_construction": {
+                    "name": "Metal Construction",
+                    "terms": "metal construction"
+                },
+                "craft/optician": {
+                    "name": "Optician",
+                    "terms": "glasses,optician"
+                },
+                "craft/painter": {
+                    "name": "Painter",
+                    "terms": "painter"
+                },
+                "craft/photographer": {
+                    "name": "Photographer",
+                    "terms": "photographer"
+                },
+                "craft/photographic_labratory": {
+                    "name": "Photographic Labratory",
+                    "terms": "photographic labratory,film developer"
+                },
+                "craft/plasterer": {
+                    "name": "Plasterer",
+                    "terms": "plasterer"
+                },
+                "craft/plumber": {
+                    "name": "Plumber",
+                    "terms": "pumber"
+                },
+                "craft/pottery": {
+                    "name": "Pottery",
+                    "terms": "pottery,potter"
+                },
+                "craft/rigger": {
+                    "name": "Rigger",
+                    "terms": "rigger"
+                },
+                "craft/roofer": {
+                    "name": "Roofer",
+                    "terms": "roofer"
+                },
+                "craft/saddler": {
+                    "name": "Saddler",
+                    "terms": "saddler"
+                },
+                "craft/sailmaker": {
+                    "name": "Sailmaker",
+                    "terms": "sailmaker"
+                },
+                "craft/sawmill": {
+                    "name": "Sawmill",
+                    "terms": "sawmill,lumber"
+                },
+                "craft/scaffolder": {
+                    "name": "Scaffolder",
+                    "terms": "scaffolder"
+                },
+                "craft/sculpter": {
+                    "name": "Sculpter",
+                    "terms": "sculpter"
+                },
+                "craft/shoemaker": {
+                    "name": "Shoemaker",
+                    "terms": "shoe repair,shoemaker"
+                },
+                "craft/stonemason": {
+                    "name": "Stonemason",
+                    "terms": "stonemason,masonry"
+                },
+                "craft/sweep": {
+                    "name": "Chimney Sweep",
+                    "terms": "sweep,chimney sweep"
+                },
+                "craft/tailor": {
+                    "name": "Tailor",
+                    "terms": "tailor,clothes"
+                },
+                "craft/tiler": {
+                    "name": "Tiler",
+                    "terms": "tiler"
+                },
+                "craft/tinsmith": {
+                    "name": "Tinsmith",
+                    "terms": "tinsmith"
+                },
+                "craft/upholsterer": {
+                    "name": "Upholsterer",
+                    "terms": "upholsterer"
+                },
+                "craft/watchmaker": {
+                    "name": "Watchmaker",
+                    "terms": "watch,watchmaker,watch repair"
+                },
+                "craft/window_construction": {
+                    "name": "Window Construction",
+                    "terms": "window,window maker,window construction"
+                },
                 "embankment": {
                     "name": "Embankment",
                     "terms": ""
                 "embankment": {
                     "name": "Embankment",
                     "terms": ""
@@ -107521,6 +111991,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Residential Road",
                     "terms": ""
                 },
                     "name": "Residential Road",
                     "terms": ""
                 },
+                "highway/rest_area": {
+                    "name": "Rest Area",
+                    "terms": "rest stop,turnout,lay-by"
+                },
                 "highway/road": {
                     "name": "Unknown Road",
                     "terms": ""
                 "highway/road": {
                     "name": "Unknown Road",
                     "terms": ""
@@ -107557,6 +112031,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Parking Aisle",
                     "terms": ""
                 },
                     "name": "Parking Aisle",
                     "terms": ""
                 },
+                "highway/services": {
+                    "name": "Service Area",
+                    "terms": "services,travel plaza,service station"
+                },
                 "highway/steps": {
                     "name": "Steps",
                     "terms": "stairs,staircase"
                 "highway/steps": {
                     "name": "Steps",
                     "terms": "stairs,staircase"
@@ -108033,6 +112511,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Travel Agency",
                     "terms": ""
                 },
                     "name": "Travel Agency",
                     "terms": ""
                 },
+                "piste": {
+                    "name": "Piste/Ski Trail",
+                    "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
+                },
                 "place": {
                     "name": "Place",
                     "terms": ""
                 "place": {
                     "name": "Place",
                     "terms": ""
@@ -108121,6 +112603,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Disused Railway",
                     "terms": ""
                 },
                     "name": "Disused Railway",
                     "terms": ""
                 },
+                "railway/funicular": {
+                    "name": "Funicular",
+                    "terms": "venicular,cliff railway,cable car,cable railway,funicular railway"
+                },
                 "railway/halt": {
                     "name": "Railway Halt",
                     "terms": "break,interrupt,rest,wait,interruption"
                 "railway/halt": {
                     "name": "Railway Halt",
                     "terms": "break,interrupt,rest,wait,interruption"
@@ -108133,6 +112619,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Monorail",
                     "terms": ""
                 },
                     "name": "Monorail",
                     "terms": ""
                 },
+                "railway/narrow_gauge": {
+                    "name": "Narrow Gauge Rail",
+                    "terms": "narrow gauge railway,narrow gauge railroad"
+                },
                 "railway/platform": {
                     "name": "Railway Platform",
                     "terms": ""
                 "railway/platform": {
                     "name": "Railway Platform",
                     "terms": ""
@@ -108173,6 +112663,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Liquor Store",
                     "terms": "alcohol"
                 },
                     "name": "Liquor Store",
                     "terms": "alcohol"
                 },
+                "shop/art": {
+                    "name": "Art Shop",
+                    "terms": "art store,art gallery"
+                },
                 "shop/bakery": {
                     "name": "Bakery",
                     "terms": ""
                 "shop/bakery": {
                     "name": "Bakery",
                     "terms": ""
@@ -108189,6 +112683,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Bicycle Shop",
                     "terms": ""
                 },
                     "name": "Bicycle Shop",
                     "terms": ""
                 },
+                "shop/bookmaker": {
+                    "name": "Bookmaker",
+                    "terms": ""
+                },
                 "shop/books": {
                     "name": "Bookstore",
                     "terms": ""
                 "shop/books": {
                     "name": "Bookstore",
                     "terms": ""
@@ -108309,6 +112807,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Locksmith",
                     "terms": "keys"
                 },
                     "name": "Locksmith",
                     "terms": "keys"
                 },
+                "shop/lottery": {
+                    "name": "Lottery Shop",
+                    "terms": ""
+                },
                 "shop/mall": {
                     "name": "Mall",
                     "terms": ""
                 "shop/mall": {
                     "name": "Mall",
                     "terms": ""
@@ -108510,4612 +113012,4733 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "type/route/train": {
                     "terms": ""
                 },
                 "type/route/train": {
-                    "name": "Train Route",
-                    "terms": ""
-                },
-                "type/route/tram": {
-                    "name": "Tram Route",
-                    "terms": ""
-                },
-                "type/route_master": {
-                    "name": "Route Master",
-                    "terms": ""
-                },
-                "vertex": {
-                    "name": "Other",
-                    "terms": ""
-                },
-                "waterway": {
-                    "name": "Waterway",
-                    "terms": ""
-                },
-                "waterway/canal": {
-                    "name": "Canal",
-                    "terms": ""
-                },
-                "waterway/dam": {
-                    "name": "Dam",
-                    "terms": ""
-                },
-                "waterway/ditch": {
-                    "name": "Ditch",
-                    "terms": ""
-                },
-                "waterway/drain": {
-                    "name": "Drain",
-                    "terms": ""
-                },
-                "waterway/river": {
-                    "name": "River",
-                    "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"
-                },
-                "waterway/riverbank": {
-                    "name": "Riverbank",
-                    "terms": ""
-                },
-                "waterway/stream": {
-                    "name": "Stream",
-                    "terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse"
-                },
-                "waterway/weir": {
-                    "name": "Weir",
-                    "terms": ""
-                }
-            }
-        }
-    },
-    "suggestions": {
-        "amenity": {
-            "bank": {
-                "ABN AMRO": {
-                    "count": 129
-                },
-                "ABSA": {
-                    "count": 88
-                },
-                "AIB": {
-                    "count": 71
-                },
-                "ANZ": {
-                    "count": 199
-                },
-                "AXA": {
-                    "count": 66
-                },
-                "Alior Bank": {
-                    "count": 71
-                },
-                "Allied Bank": {
-                    "count": 115
-                },
-                "Alpha Bank": {
-                    "count": 94
-                },
-                "Argenta": {
-                    "count": 84
-                },
-                "Axis Bank": {
-                    "count": 52
-                },
-                "BAWAG PSK": {
-                    "count": 105
-                },
-                "BB&T": {
-                    "count": 126
-                },
-                "BBK": {
-                    "count": 69
-                },
-                "BBVA": {
-                    "count": 574
-                },
-                "BCI": {
-                    "count": 57
-                },
-                "BCR": {
-                    "count": 137
-                },
-                "BDO": {
-                    "count": 275
-                },
-                "BES": {
-                    "count": 68
-                },
-                "BMO": {
-                    "count": 160
-                },
-                "BNL": {
-                    "count": 78
-                },
-                "BNP": {
-                    "count": 109
-                },
-                "BNP Paribas": {
-                    "count": 574
+                    "name": "Train Route",
+                    "terms": ""
                 },
                 },
-                "BNP Paribas Fortis": {
-                    "count": 204
+                "type/route/tram": {
+                    "name": "Tram Route",
+                    "terms": ""
                 },
                 },
-                "BPI": {
-                    "count": 393
+                "type/route_master": {
+                    "name": "Route Master",
+                    "terms": ""
                 },
                 },
-                "BRD": {
-                    "count": 179
+                "vertex": {
+                    "name": "Other",
+                    "terms": ""
                 },
                 },
-                "BW-Bank": {
-                    "count": 97
+                "waterway": {
+                    "name": "Waterway",
+                    "terms": ""
                 },
                 },
-                "BZ WBK": {
-                    "count": 65
+                "waterway/canal": {
+                    "name": "Canal",
+                    "terms": ""
                 },
                 },
-                "Banamex": {
-                    "count": 130
+                "waterway/dam": {
+                    "name": "Dam",
+                    "terms": ""
                 },
                 },
-                "Banca Intesa": {
-                    "count": 58
+                "waterway/ditch": {
+                    "name": "Ditch",
+                    "terms": ""
                 },
                 },
-                "Banca Popolare di Novara": {
-                    "count": 51
+                "waterway/drain": {
+                    "name": "Drain",
+                    "terms": ""
                 },
                 },
-                "Banca Popolare di Vicenza": {
-                    "count": 67
+                "waterway/river": {
+                    "name": "River",
+                    "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"
                 },
                 },
-                "Banca Transilvania": {
-                    "count": 131
+                "waterway/riverbank": {
+                    "name": "Riverbank",
+                    "terms": ""
                 },
                 },
-                "Bancaja": {
-                    "count": 58
+                "waterway/stream": {
+                    "name": "Stream",
+                    "terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse"
                 },
                 },
-                "Banco BCI": {
+                "waterway/weir": {
+                    "name": "Weir",
+                    "terms": ""
+                }
+            }
+        }
+    },
+    "suggestions": {
+        "amenity": {
+            "pub": {
+                "The Green Man": {
                     "count": 51
                 },
                     "count": 51
                 },
-                "Banco Estado": {
+                "Kings Arms": {
                     "count": 67
                 },
                     "count": 67
                 },
-                "Banco G&T Continental": {
-                    "count": 62
+                "Red Lion": {
+                    "count": 203
                 },
                 },
-                "Banco Itaú": {
-                    "count": 82
+                "The Ship": {
+                    "count": 87
                 },
                 },
-                "Banco Nación": {
-                    "count": 59
+                "The White Horse": {
+                    "count": 201
                 },
                 },
-                "Banco Pastor": {
-                    "count": 62
+                "The White Hart": {
+                    "count": 228
                 },
                 },
-                "Banco Popular": {
-                    "count": 262
+                "Royal Oak": {
+                    "count": 147
                 },
                 },
-                "Banco Provincia": {
-                    "count": 62
+                "The Red Lion": {
+                    "count": 231
                 },
                 },
-                "Banco Santander": {
-                    "count": 91
+                "The Kings Arms": {
+                    "count": 58
                 },
                 },
-                "Banco de Chile": {
-                    "count": 95
+                "The Star": {
+                    "count": 73
                 },
                 },
-                "Banco de Costa Rica": {
+                "The Anchor": {
                     "count": 64
                 },
                     "count": 64
                 },
-                "Banco de Desarrollo Banrural": {
-                    "count": 74
-                },
-                "Banco de la Nación": {
-                    "count": 93
-                },
-                "Banco do Brasil": {
-                    "count": 440
-                },
-                "BancoEstado": {
-                    "count": 79
+                "The Cross Keys": {
+                    "count": 55
                 },
                 },
-                "Bancolombia": {
-                    "count": 85
+                "The Wheatsheaf": {
+                    "count": 117
                 },
                 },
-                "Bancomer": {
-                    "count": 96
+                "The Crown Inn": {
+                    "count": 68
                 },
                 },
-                "Bancpost": {
-                    "count": 51
+                "The Kings Head": {
+                    "count": 53
                 },
                 },
-                "Banesco": {
-                    "count": 86
+                "The Castle": {
+                    "count": 58
                 },
                 },
-                "Banesto": {
-                    "count": 198
+                "The Railway": {
+                    "count": 100
                 },
                 },
-                "Bank Austria": {
-                    "count": 174
+                "The White Lion": {
+                    "count": 118
                 },
                 },
-                "Bank Mandiri": {
-                    "count": 56
+                "The Bell": {
+                    "count": 121
                 },
                 },
-                "Bank Spółdzielczy": {
-                    "count": 142
+                "The Bull": {
+                    "count": 67
                 },
                 },
-                "Bank of America": {
-                    "count": 836
+                "The Plough": {
+                    "count": 177
                 },
                 },
-                "Bank of Ireland": {
+                "The George": {
                     "count": 109
                 },
                     "count": 109
                 },
-                "Bank of Montreal": {
-                    "count": 111
+                "The Royal Oak": {
+                    "count": 210
                 },
                 },
-                "Bank of Scotland": {
-                    "count": 85
+                "The Fox": {
+                    "count": 76
                 },
                 },
-                "Bank of the West": {
-                    "count": 86
+                "Prince of Wales": {
+                    "count": 76
                 },
                 },
-                "Bankia": {
-                    "count": 108
+                "The Rising Sun": {
+                    "count": 69
                 },
                 },
-                "Bankinter": {
-                    "count": 54
+                "The Prince of Wales": {
+                    "count": 51
                 },
                 },
-                "Banorte": {
-                    "count": 65
+                "The Crown": {
+                    "count": 241
                 },
                 },
-                "Banque Nationale": {
-                    "count": 56
+                "The Chequers": {
+                    "count": 64
                 },
                 },
-                "Banque Populaire": {
-                    "count": 399
+                "The Swan": {
+                    "count": 150
                 },
                 },
-                "Barclays": {
-                    "count": 925
+                "Rose and Crown": {
+                    "count": 79
                 },
                 },
-                "Belfius": {
-                    "count": 219
+                "The Victoria": {
+                    "count": 68
                 },
                 },
-                "Bendigo Bank": {
-                    "count": 88
+                "New Inn": {
+                    "count": 89
                 },
                 },
-                "Berliner Sparkasse": {
-                    "count": 61
+                "Royal Hotel": {
+                    "count": 55
                 },
                 },
-                "Berliner Volksbank": {
-                    "count": 79
+                "Cross Keys": {
+                    "count": 59
                 },
                 },
-                "Bicentenario": {
-                    "count": 183
+                "The Greyhound": {
+                    "count": 96
                 },
                 },
-                "Bradesco": {
-                    "count": 236
+                "The Black Horse": {
+                    "count": 94
                 },
                 },
-                "CIBC": {
-                    "count": 306
+                "The New Inn": {
+                    "count": 104
                 },
                 },
-                "CIC": {
-                    "count": 393
+                "Kings Head": {
+                    "count": 57
                 },
                 },
-                "Caisse d'Épargne": {
-                    "count": 801
+                "The Angel": {
+                    "count": 53
                 },
                 },
-                "Caixa": {
-                    "count": 99
+                "The Queens Head": {
+                    "count": 51
                 },
                 },
-                "Caixa Econômica Federal": {
-                    "count": 131
+                "The Ship Inn": {
+                    "count": 83
                 },
                 },
-                "Caixa Geral de Depósitos": {
-                    "count": 119
+                "Rose & Crown": {
+                    "count": 51
                 },
                 },
-                "Caja Círculo": {
-                    "count": 65
+                "Queens Head": {
+                    "count": 51
                 },
                 },
-                "Caja Duero": {
-                    "count": 58
+                "Irish Pub": {
+                    "count": 79
+                }
+            },
+            "fuel": {
+                "76": {
+                    "count": 295
                 },
                 },
-                "Caja Madrid": {
-                    "count": 115
+                "Neste": {
+                    "count": 192
                 },
                 },
-                "Caja Rural": {
-                    "count": 87
+                "BP": {
+                    "count": 2444
                 },
                 },
-                "Caja de Burgos": {
-                    "count": 58
+                "Shell": {
+                    "count": 8191
                 },
                 },
-                "Cajamar": {
-                    "count": 61
+                "Agip": {
+                    "count": 2652
                 },
                 },
-                "Cajero Automatico Bancared": {
-                    "count": 147
+                "Migrol": {
+                    "count": 65
                 },
                 },
-                "Canara Bank": {
-                    "count": 82
+                "Avia": {
+                    "count": 883
                 },
                 },
-                "Cassa di Risparmio del Veneto": {
-                    "count": 58
+                "Texaco": {
+                    "count": 667
                 },
                 },
-                "Chase": {
-                    "count": 623
+                "Total": {
+                    "count": 2545
                 },
                 },
-                "China Bank": {
-                    "count": 59
+                "Statoil": {
+                    "count": 589
                 },
                 },
-                "Chinabank": {
-                    "count": 54
+                "Esso": {
+                    "count": 3595
                 },
                 },
-                "Citibank": {
-                    "count": 249
+                "Jet": {
+                    "count": 438
                 },
                 },
-                "Citizens Bank": {
-                    "count": 107
+                "Avanti": {
+                    "count": 89
                 },
                 },
-                "CityCommerce Bank": {
-                    "count": 53
+                "Sainsbury's": {
+                    "count": 57
                 },
                 },
-                "Commercial Bank of Ceylon PLC": {
-                    "count": 80
+                "OMV": {
+                    "count": 706
                 },
                 },
-                "Commerzbank": {
-                    "count": 799
+                "Aral": {
+                    "count": 1334
                 },
                 },
-                "Commonwealth Bank": {
-                    "count": 218
+                "Tesco": {
+                    "count": 193
                 },
                 },
-                "Credit Agricole": {
-                    "count": 143
+                "JET": {
+                    "count": 178
                 },
                 },
-                "Credit Suisse": {
-                    "count": 69
+                "Morrisons": {
+                    "count": 108
                 },
                 },
-                "Crédit Agricole": {
-                    "count": 1160
+                "United": {
+                    "count": 89
                 },
                 },
-                "Crédit Mutuel": {
-                    "count": 648
+                "Canadian Tire": {
+                    "count": 65
                 },
                 },
-                "Crédit Mutuel de Bretagne": {
-                    "count": 335
+                "Mobil": {
+                    "count": 586
                 },
                 },
-                "Crédit du Nord": {
-                    "count": 88
+                "Caltex": {
+                    "count": 973
                 },
                 },
-                "Danske Bank": {
-                    "count": 130
+                "Sunoco": {
+                    "count": 336
                 },
                 },
-                "Davivienda": {
-                    "count": 83
+                "Q8": {
+                    "count": 1160
                 },
                 },
-                "De Venezuela": {
-                    "count": 127
+                "ABC": {
+                    "count": 80
                 },
                 },
-                "Del Tesoro": {
-                    "count": 94
+                "Tankstelle": {
+                    "count": 115
                 },
                 },
-                "Deutsche Bank": {
-                    "count": 836
+                "ARAL": {
+                    "count": 366
                 },
                 },
-                "Dresdner Bank": {
-                    "count": 77
+                "CEPSA": {
+                    "count": 1017
                 },
                 },
-                "Ecobank": {
-                    "count": 54
+                "BFT": {
+                    "count": 88
                 },
                 },
-                "Erste Bank": {
-                    "count": 178
+                "Petron": {
+                    "count": 862
                 },
                 },
-                "Eurobank": {
-                    "count": 89
+                "Intermarché": {
+                    "count": 428
                 },
                 },
-                "FNB": {
-                    "count": 90
+                "Super U": {
+                    "count": 122
                 },
                 },
-                "Fifth Third Bank": {
-                    "count": 66
+                "Auchan": {
+                    "count": 52
                 },
                 },
-                "First National Bank": {
-                    "count": 76
+                "Elf": {
+                    "count": 131
                 },
                 },
-                "GE Money Bank": {
-                    "count": 72
+                "Carrefour": {
+                    "count": 199
                 },
                 },
-                "HDFC Bank": {
-                    "count": 85
+                "Station Service E. Leclerc": {
+                    "count": 534
                 },
                 },
-                "HSBC": {
-                    "count": 1039
+                "Shell Express": {
+                    "count": 129
                 },
                 },
-                "Halifax": {
-                    "count": 214
+                "Hess": {
+                    "count": 114
                 },
                 },
-                "Hamburger Sparkasse": {
-                    "count": 157
+                "Flying V": {
+                    "count": 132
                 },
                 },
-                "Handelsbanken": {
-                    "count": 178
+                "bft": {
+                    "count": 169
                 },
                 },
-                "HypoVereinsbank": {
-                    "count": 570
+                "Gulf": {
+                    "count": 192
                 },
                 },
-                "ICICI Bank": {
-                    "count": 78
+                "PTT": {
+                    "count": 176
                 },
                 },
-                "ING": {
-                    "count": 468
+                "St1": {
+                    "count": 102
                 },
                 },
-                "ING Bank Śląski": {
-                    "count": 64
+                "Teboil": {
+                    "count": 120
                 },
                 },
-                "Ibercaja": {
-                    "count": 58
+                "HEM": {
+                    "count": 218
                 },
                 },
-                "Intesa San Paolo": {
-                    "count": 60
+                "GALP": {
+                    "count": 593
                 },
                 },
-                "Itaú": {
-                    "count": 278
+                "OK": {
+                    "count": 160
                 },
                 },
-                "KBC": {
-                    "count": 194
+                "ÖMV": {
+                    "count": 100
                 },
                 },
-                "Key Bank": {
-                    "count": 139
+                "Tinq": {
+                    "count": 215
                 },
                 },
-                "Komerční banka": {
-                    "count": 136
+                "OKQ8": {
+                    "count": 187
                 },
                 },
-                "Kreissparkasse": {
-                    "count": 579
+                "Freie Tankstelle": {
+                    "count": 217
                 },
                 },
-                "Kreissparkasse Köln": {
-                    "count": 67
+                "Repsol": {
+                    "count": 408
                 },
                 },
-                "LCL": {
-                    "count": 508
+                "Westfalen": {
+                    "count": 96
                 },
                 },
-                "La Banque Postale": {
-                    "count": 61
+                "Esso Express": {
+                    "count": 87
                 },
                 },
-                "La Caixa": {
-                    "count": 513
+                "Raiffeisenbank": {
+                    "count": 115
                 },
                 },
-                "Landbank": {
-                    "count": 79
+                "Tamoil": {
+                    "count": 865
                 },
                 },
-                "Lloyds Bank": {
-                    "count": 541
+                "Engen": {
+                    "count": 230
                 },
                 },
-                "M&T Bank": {
-                    "count": 80
+                "Sasol": {
+                    "count": 58
                 },
                 },
-                "Maybank": {
-                    "count": 81
+                "Topaz": {
+                    "count": 78
                 },
                 },
-                "Mercantil": {
-                    "count": 220
+                "LPG": {
+                    "count": 170
                 },
                 },
-                "Metrobank": {
-                    "count": 253
+                "Coop": {
+                    "count": 55
                 },
                 },
-                "Millenium Bank": {
-                    "count": 60
+                "Orlen": {
+                    "count": 577
                 },
                 },
-                "Millennium Bank": {
-                    "count": 415
+                "Oilibya": {
+                    "count": 66
                 },
                 },
-                "Monte dei Paschi di Siena": {
-                    "count": 126
+                "Tango": {
+                    "count": 122
                 },
                 },
-                "NAB": {
-                    "count": 123
+                "Star": {
+                    "count": 315
                 },
                 },
-                "NatWest": {
-                    "count": 606
+                "Петрол": {
+                    "count": 81
                 },
                 },
-                "National Bank": {
-                    "count": 87
+                "Cepsa": {
+                    "count": 82
                 },
                 },
-                "Nationwide": {
-                    "count": 193
+                "OIL!": {
+                    "count": 59
                 },
                 },
-                "Nedbank": {
-                    "count": 74
+                "Ultramar": {
+                    "count": 124
                 },
                 },
-                "Nordea": {
-                    "count": 312
+                "Irving": {
+                    "count": 86
                 },
                 },
-                "OLB": {
-                    "count": 52
+                "Lukoil": {
+                    "count": 689
                 },
                 },
-                "OTP": {
-                    "count": 184
+                "Petro-Canada": {
+                    "count": 477
                 },
                 },
-                "Oberbank": {
-                    "count": 87
+                "7-Eleven": {
+                    "count": 447
                 },
                 },
-                "Oldenburgische Landesbank": {
-                    "count": 56
+                "Agrola": {
+                    "count": 70
                 },
                 },
-                "Osuuspankki": {
-                    "count": 74
+                "Husky": {
+                    "count": 119
                 },
                 },
-                "PKO BP": {
-                    "count": 239
+                "Slovnaft": {
+                    "count": 218
+                },
+                "Sheetz": {
+                    "count": 113
                 },
                 },
-                "PNB": {
-                    "count": 106
+                "Mol": {
+                    "count": 56
                 },
                 },
-                "PNC Bank": {
-                    "count": 215
+                "Petronas": {
+                    "count": 151
                 },
                 },
-                "PSBank": {
-                    "count": 57
+                "Газпромнефть": {
+                    "count": 742
                 },
                 },
-                "Pekao SA": {
-                    "count": 53
+                "Лукойл": {
+                    "count": 1451
                 },
                 },
-                "Peoples Bank": {
-                    "count": 55
+                "Elan": {
+                    "count": 113
                 },
                 },
-                "Postbank": {
-                    "count": 433
+                "Роснефть": {
+                    "count": 621
                 },
                 },
-                "RBC": {
-                    "count": 220
+                "Turmöl": {
+                    "count": 57
                 },
                 },
-                "RBS": {
-                    "count": 136
+                "Neste A24": {
+                    "count": 57
                 },
                 },
-                "RCBC": {
-                    "count": 117
+                "Marathon": {
+                    "count": 170
                 },
                 },
-                "Rabobank": {
-                    "count": 619
+                "Valero": {
+                    "count": 348
                 },
                 },
-                "Raiffeisenbank": {
-                    "count": 2028
+                "Eni": {
+                    "count": 219
                 },
                 },
-                "Regions Bank": {
-                    "count": 59
+                "Chevron": {
+                    "count": 918
                 },
                 },
-                "Royal Bank": {
-                    "count": 65
+                "ТНК": {
+                    "count": 512
                 },
                 },
-                "Royal Bank of Scotland": {
-                    "count": 108
+                "REPSOL": {
+                    "count": 1609
                 },
                 },
-                "SEB": {
-                    "count": 129
+                "MOL": {
+                    "count": 226
                 },
                 },
-                "Santander": {
-                    "count": 1181
+                "Bliska": {
+                    "count": 150
                 },
                 },
-                "Santander Consumer Bank": {
-                    "count": 81
+                "Api": {
+                    "count": 307
                 },
                 },
-                "Santander Totta": {
-                    "count": 63
+                "Arco": {
+                    "count": 174
                 },
                 },
-                "Sberbank": {
-                    "count": 61
+                "Pemex": {
+                    "count": 385
                 },
                 },
-                "Scotiabank": {
-                    "count": 379
+                "Exxon": {
+                    "count": 474
                 },
                 },
-                "Security Bank": {
-                    "count": 71
+                "Coles Express": {
+                    "count": 108
                 },
                 },
-                "Slovenská sporiteľňa": {
-                    "count": 127
+                "Petrom": {
+                    "count": 256
                 },
                 },
-                "Société Générale": {
-                    "count": 592
+                "PETRONOR": {
+                    "count": 208
                 },
                 },
-                "Sparda-Bank": {
-                    "count": 313
+                "Rompetrol": {
+                    "count": 165
                 },
                 },
-                "Sparkasse": {
-                    "count": 4521
+                "Lotos": {
+                    "count": 171
                 },
                 },
-                "Sparkasse Aachen": {
-                    "count": 58
+                "ОМВ": {
+                    "count": 60
                 },
                 },
-                "Sparkasse KölnBonn": {
-                    "count": 55
+                "BR": {
+                    "count": 102
                 },
                 },
-                "Stadtsparkasse": {
-                    "count": 86
+                "Copec": {
+                    "count": 500
                 },
                 },
-                "Standard Bank": {
-                    "count": 100
+                "Petrobras": {
+                    "count": 260
                 },
                 },
-                "State Bank of India": {
-                    "count": 132
+                "Liberty": {
+                    "count": 53
                 },
                 },
-                "SunTrust": {
-                    "count": 63
+                "IP": {
+                    "count": 855
                 },
                 },
-                "SunTrust Bank": {
-                    "count": 66
+                "YPF": {
+                    "count": 158
                 },
                 },
-                "Swedbank": {
-                    "count": 219
+                "Erg": {
+                    "count": 594
                 },
                 },
-                "TD Bank": {
-                    "count": 178
+                "Eneos": {
+                    "count": 96
                 },
                 },
-                "TD Canada Trust": {
-                    "count": 421
+                "Citgo": {
+                    "count": 268
                 },
                 },
-                "TSB": {
-                    "count": 51
+                "Metano": {
+                    "count": 206
                 },
                 },
-                "Targobank": {
-                    "count": 167
+                "Сургутнефтегаз": {
+                    "count": 62
                 },
                 },
-                "Tatra banka": {
-                    "count": 65
+                "EKO": {
+                    "count": 58
                 },
                 },
-                "UBS": {
-                    "count": 129
+                "Eko": {
+                    "count": 58
                 },
                 },
-                "UCPB": {
-                    "count": 87
+                "Indipend.": {
+                    "count": 175
                 },
                 },
-                "US Bank": {
-                    "count": 214
+                "IES": {
+                    "count": 63
                 },
                 },
-                "Ulster Bank": {
+                "TotalErg": {
                     "count": 85
                 },
                     "count": 85
                 },
-                "UniCredit Bank": {
-                    "count": 376
+                "Cenex": {
+                    "count": 114
                 },
                 },
-                "Unicredit Banca": {
-                    "count": 224
+                "ПТК": {
+                    "count": 81
                 },
                 },
-                "Unicaja": {
-                    "count": 74
+                "HP": {
+                    "count": 76
                 },
                 },
-                "Union Bank": {
-                    "count": 110
+                "Phillips 66": {
+                    "count": 202
                 },
                 },
-                "VR-Bank": {
-                    "count": 421
+                "CARREFOUR": {
+                    "count": 73
                 },
                 },
-                "Volksbank": {
-                    "count": 2573
+                "ERG": {
+                    "count": 75
                 },
                 },
-                "VÚB": {
-                    "count": 108
+                "Speedway": {
+                    "count": 131
                 },
                 },
-                "Wachovia": {
-                    "count": 61
+                "Benzina": {
+                    "count": 70
                 },
                 },
-                "Wells Fargo": {
-                    "count": 781
+                "Татнефть": {
+                    "count": 258
                 },
                 },
-                "Western Union": {
-                    "count": 84
+                "Terpel": {
+                    "count": 258
                 },
                 },
-                "Westpac": {
-                    "count": 194
+                "WOG": {
+                    "count": 169
                 },
                 },
-                "Yorkshire Bank": {
-                    "count": 60
+                "Seaoil": {
+                    "count": 53
                 },
                 },
-                "ČSOB": {
-                    "count": 157
+                "АЗС": {
+                    "count": 1048
                 },
                 },
-                "Česká spořitelna": {
-                    "count": 207
+                "Kwik Trip": {
+                    "count": 104
                 },
                 },
-                "Альфа-Банк": {
-                    "count": 183
+                "Wawa": {
+                    "count": 81
                 },
                 },
-                "Банк Москвы": {
-                    "count": 116
+                "Pertamina": {
+                    "count": 182
                 },
                 },
-                "Белагропромбанк": {
-                    "count": 66
+                "COSMO": {
+                    "count": 65
                 },
                 },
-                "Беларусбанк": {
-                    "count": 223
+                "Z": {
+                    "count": 75
                 },
                 },
-                "ВТБ": {
-                    "count": 54
+                "Indian Oil": {
+                    "count": 167
                 },
                 },
-                "Ð\92ТÐ\9124": {
-                    "count": 298
+                "Ð\90Ð\93Ð\97С": {
+                    "count": 486
                 },
                 },
-                "Возрождение": {
-                    "count": 56
+                "INA": {
+                    "count": 119
                 },
                 },
-                "Газпромбанк": {
-                    "count": 93
+                "JOMO": {
+                    "count": 63
                 },
                 },
-                "Ощадбанк": {
-                    "count": 292
+                "Holiday": {
+                    "count": 96
                 },
                 },
-                "ПриватБанк": {
-                    "count": 480
+                "IDEMITSU": {
+                    "count": 88
                 },
                 },
-                "Промсвязьбанк": {
-                    "count": 86
+                "ENEOS": {
+                    "count": 702
                 },
                 },
-                "Райффайзен Банк Аваль": {
-                    "count": 57
+                "Stacja paliw": {
+                    "count": 84
                 },
                 },
-                "Росбанк": {
-                    "count": 172
+                "Bharat Petroleum": {
+                    "count": 51
                 },
                 },
-                "Россельхозбанк": {
-                    "count": 181
+                "CAMPSA": {
+                    "count": 622
                 },
                 },
-                "Сбербанк": {
-                    "count": 4579
+                "Casey's General Store": {
+                    "count": 179
                 },
                 },
-                "Совкомбанк": {
+                "Kangaroo": {
+                    "count": 57
+                },
+                "Белоруснефть": {
                     "count": 51
                 },
                     "count": 51
                 },
-                "УкрСиббанк": {
-                    "count": 125
+                "コスモ石油 (COSMO)": {
+                    "count": 132
                 },
                 },
-                "Уралсиб": {
-                    "count": 83
+                "MEROIL": {
+                    "count": 78
                 },
                 },
-                "ლიბერთი ბანკი": {
-                    "count": 55,
-                    "tags": {
-                        "name:en": "Liberty Bank"
-                    }
+                "1-2-3": {
+                    "count": 71
                 },
                 },
-                "みずほ銀行": {
-                    "count": 68
+                "Conoco": {
+                    "count": 171
                 },
                 },
-                "りそな銀行": {
-                    "count": 227,
+                "出光": {
+                    "count": 214,
                     "tags": {
                     "tags": {
-                        "name:en": "Mizuho Bank"
+                        "name:en": "IDEMITSU"
                     }
                 },
                     }
                 },
-                "三井住友銀行": {
-                    "count": 122
+                "НК Альянс": {
+                    "count": 87
                 },
                 },
-                "三菱東京UFJ銀行": {
-                    "count": 149
+                "Sinclair": {
+                    "count": 86
                 },
                 },
-                "中国银行": {
-                    "count": 65
+                "SPBU": {
+                    "count": 51
                 },
                 },
-                "광주은행": {
-                    "count": 55,
-                    "tags": {
-                        "name:en": "Gwangju Bank"
-                    }
+                "Макпетрол": {
+                    "count": 109
                 },
                 },
-                "국민은행": {
-                    "count": 167,
-                    "tags": {
-                        "name:en": "Gungmin Bank"
-                    }
+                "Circle K": {
+                    "count": 156
                 },
                 },
-                "농협": {
-                    "count": 51
+                "Posto Ipiranga": {
+                    "count": 57
                 },
                 },
-                "신한은행": {
-                    "count": 218,
-                    "tags": {
-                        "name:en": "Sinhan Bank"
-                    }
+                "Phoenix": {
+                    "count": 143
                 },
                 },
-                "우리은행": {
-                    "count": 293,
-                    "tags": {
-                        "name:en": "Uri Bank"
-                    }
+                "Ipiranga": {
+                    "count": 83
                 },
                 },
-                "중소기업은행": {
-                    "count": 53,
-                    "tags": {
-                        "name:en": "Industrial Bank of Korea"
-                    }
+                "OKKO": {
+                    "count": 83
                 },
                 },
-                "하나은행": {
-                    "count": 78
-                }
-            },
-            "cafe": {
-                "Cafe Amazon": {
-                    "count": 51
+                "ОККО": {
+                    "count": 116
                 },
                 },
-                "Cafe Coffee Day": {
-                    "count": 103
+                "บางจาก": {
+                    "count": 59
                 },
                 },
-                "Cafeteria": {
-                    "count": 69
+                "QuikTrip": {
+                    "count": 92
                 },
                 },
-                "Caffè Nero": {
-                    "count": 159
+                "Stewart's": {
+                    "count": 62
                 },
                 },
-                "Café Central": {
+                "Posto BR": {
                     "count": 58
                 },
                     "count": 58
                 },
-                "Caribou Coffee": {
-                    "count": 92
+                "ป ต ท": {
+                    "count": 153
                 },
                 },
-                "Coffee Time": {
-                    "count": 94
+                "ปตท": {
+                    "count": 88
                 },
                 },
-                "Costa": {
-                    "count": 548
+                "ANP": {
+                    "count": 77
                 },
                 },
-                "Dunkin Donuts": {
-                    "count": 365,
-                    "tags": {
-                        "cuisine": "donut"
-                    }
+                "Kum & Go": {
+                    "count": 84
+                },
+                "Sokimex": {
+                    "count": 61
                 },
                 },
-                "Eiscafe": {
+                "Tela": {
                     "count": 115
                 },
                     "count": 115
                 },
-                "Eiscafe Venezia": {
-                    "count": 176
+                "Укрнафта": {
+                    "count": 57
                 },
                 },
-                "Eisdiele": {
-                    "count": 64
+                "Татнефтепродукт": {
+                    "count": 54
                 },
                 },
-                "Pret A Manger": {
-                    "count": 115
+                "Afriquia": {
+                    "count": 88
                 },
                 },
-                "Second Cup": {
-                    "count": 170
+                "Murphy USA": {
+                    "count": 62
                 },
                 },
-                "Segafredo": {
-                    "count": 67
+                "昭和シェル (Showa-shell)": {
+                    "count": 94
                 },
                 },
-                "Starbucks": {
-                    "count": 3837,
+                "CNG": {
+                    "count": 79
+                }
+            },
+            "fast_food": {
+                "Quick": {
+                    "count": 482
+                },
+                "McDonald's": {
+                    "count": 12049,
                     "tags": {
                     "tags": {
-                        "cuisine": "coffee_shop"
+                        "cuisine": "burger"
                     }
                 },
                     }
                 },
-                "Tchibo": {
-                    "count": 91
+                "Subway": {
+                    "count": 5378,
+                    "tags": {
+                        "cuisine": "sandwich"
+                    }
                 },
                 },
-                "Traveler's Coffee": {
+                "Burger King": {
+                    "count": 3594,
+                    "tags": {
+                        "cuisine": "burger"
+                    }
+                },
+                "Ali Baba": {
                     "count": 59
                 },
                     "count": 59
                 },
-                "Кафе": {
-                    "count": 244
+                "Hungry Jacks": {
+                    "count": 170,
+                    "tags": {
+                        "cuisine": "burger"
+                    }
                 },
                 },
-                "Кофе Хауз": {
-                    "count": 99
+                "Red Rooster": {
+                    "count": 147
                 },
                 },
-                "Столовая": {
-                    "count": 320
+                "KFC": {
+                    "count": 3093,
+                    "tags": {
+                        "cuisine": "chicken"
+                    }
                 },
                 },
-                "Шашлычная": {
-                    "count": 51
+                "Domino's Pizza": {
+                    "count": 935,
+                    "tags": {
+                        "cuisine": "pizza"
+                    }
                 },
                 },
-                "Шоколадница": {
-                    "count": 124
+                "Chowking": {
+                    "count": 141
                 },
                 },
-                "คาเฟ่ อเมซอน": {
-                    "count": 63
+                "Jollibee": {
+                    "count": 390
                 },
                 },
-                "カフェ・ド・クリエ": {
-                    "count": 68,
-                    "tags": {
-                        "name:en": "Cafe de CRIE"
-                    }
+                "Hesburger": {
+                    "count": 99
                 },
                 },
-                "スターバックス": {
-                    "count": 245,
+                "肯德基": {
+                    "count": 84
+                },
+                "Wendy's": {
+                    "count": 1554,
                     "tags": {
                     "tags": {
-                        "name:en": "Starbucks"
+                        "cuisine": "burger"
                     }
                 },
                     }
                 },
-                "ドトール": {
-                    "count": 163,
+                "Tim Hortons": {
+                    "count": 304
+                },
+                "Steers": {
+                    "count": 143
+                },
+                "Hardee's": {
+                    "count": 253,
                     "tags": {
                     "tags": {
-                        "name:en": "DOUTOR"
+                        "cuisine": "burger"
                     }
                     }
-                }
-            },
-            "car_rental": {
-                "Avis": {
-                    "count": 263
                 },
                 },
-                "Budget": {
-                    "count": 81
+                "Arby's": {
+                    "count": 747
                 },
                 },
-                "Enterprise": {
-                    "count": 173
+                "A&W": {
+                    "count": 268
                 },
                 },
-                "Europcar": {
-                    "count": 271
+                "Dairy Queen": {
+                    "count": 752
                 },
                 },
-                "Hertz": {
-                    "count": 276
+                "Hallo Pizza": {
+                    "count": 76
                 },
                 },
-                "Sixt": {
-                    "count": 150
+                "Fish & Chips": {
+                    "count": 85
                 },
                 },
-                "stadtmobil CarSharing-Station": {
-                    "count": 162
-                }
-            },
-            "fast_food": {
-                "A&W": {
-                    "count": 255
+                "Harvey's": {
+                    "count": 88
                 },
                 },
-                "Ali Baba": {
-                    "count": 57
+                "麥當勞": {
+                    "count": 55
                 },
                 },
-                "Arby's": {
-                    "count": 714
+                "Pizza Pizza": {
+                    "count": 203
                 },
                 },
-                "Asia Imbiss": {
-                    "count": 103
+                "Kotipizza": {
+                    "count": 75
                 },
                 },
-                "Baskin Robbins": {
-                    "count": 69
+                "Jack in the Box": {
+                    "count": 530,
+                    "tags": {
+                        "cuisine": "burger"
+                    }
                 },
                 },
-                "Boston Market": {
-                    "count": 57
+                "Istanbul": {
+                    "count": 56
+                },
+                "Kochlöffel": {
+                    "count": 68
+                },
+                "Döner": {
+                    "count": 227
+                },
+                "Telepizza": {
+                    "count": 190
                 },
                 },
-                "Burger King": {
-                    "count": 3449,
-                    "tags": {
-                        "cuisine": "burger"
-                    }
+                "Sibylla": {
+                    "count": 60
                 },
                 "Carl's Jr.": {
                 },
                 "Carl's Jr.": {
-                    "count": 272,
+                    "count": 287,
                     "tags": {
                         "cuisine": "burger"
                     }
                 },
                     "tags": {
                         "cuisine": "burger"
                     }
                 },
-                "Chick-fil-A": {
-                    "count": 214,
+                "Quiznos": {
+                    "count": 261,
                     "tags": {
                     "tags": {
-                        "cuisine": "chicken"
+                        "cuisine": "sandwich"
                     }
                 },
                     }
                 },
-                "Chipotle": {
-                    "count": 260,
+                "Wimpy": {
+                    "count": 136
+                },
+                "Sonic": {
+                    "count": 538,
                     "tags": {
                     "tags": {
-                        "cuisine": "mexican"
+                        "cuisine": "burger"
                     }
                 },
                     }
                 },
-                "Chowking": {
-                    "count": 138
-                },
-                "Church's Chicken": {
-                    "count": 86
-                },
-                "Culver's": {
-                    "count": 427
-                },
-                "Dairy Queen": {
-                    "count": 722
+                "Taco Bell": {
+                    "count": 1367
                 },
                 },
-                "Del Taco": {
-                    "count": 137
+                "Pizza Nova": {
+                    "count": 58
                 },
                 },
-                "Domino's Pizza": {
-                    "count": 896,
+                "Papa John's": {
+                    "count": 289,
                     "tags": {
                         "cuisine": "pizza"
                     }
                 },
                     "tags": {
                         "cuisine": "pizza"
                     }
                 },
-                "Döner": {
-                    "count": 221
-                },
-                "El Pollo Loco": {
-                    "count": 61
-                },
-                "Fish & Chips": {
-                    "count": 82
+                "Nordsee": {
+                    "count": 158
                 },
                 },
-                "Five Guys": {
-                    "count": 124
+                "Mr. Sub": {
+                    "count": 104
                 },
                 },
-                "Hallo Pizza": {
-                    "count": 76
+                "Kebab": {
+                    "count": 176
                 },
                 },
-                "Hardee's": {
-                    "count": 242,
+                "Макдоналдс": {
+                    "count": 316,
                     "tags": {
                     "tags": {
-                        "cuisine": "burger"
+                        "name:en": "McDonald's"
                     }
                 },
                     }
                 },
-                "Harvey's": {
-                    "count": 83
+                "Asia Imbiss": {
+                    "count": 107
                 },
                 },
-                "Hesburger": {
-                    "count": 97
+                "Imbiss": {
+                    "count": 183
                 },
                 },
-                "Hungry Jacks": {
-                    "count": 163,
+                "Chipotle": {
+                    "count": 275,
                     "tags": {
                     "tags": {
-                        "cuisine": "burger"
+                        "cuisine": "mexican"
                     }
                 },
                     }
                 },
-                "Imbiss": {
-                    "count": 181
+                "マクドナルド": {
+                    "count": 668,
+                    "tags": {
+                        "name:en": "McDonald's",
+                        "cuisine": "burger"
+                    }
                 },
                 "In-N-Out Burger": {
                     "count": 58
                 },
                 },
                 "In-N-Out Burger": {
                     "count": 58
                 },
-                "Istanbul": {
-                    "count": 52
-                },
-                "Jack in the Box": {
-                    "count": 517,
-                    "tags": {
-                        "cuisine": "burger"
-                    }
+                "Jimmy John's": {
+                    "count": 126
                 },
                 "Jamba Juice": {
                 },
                 "Jamba Juice": {
-                    "count": 60
+                    "count": 63
                 },
                 },
-                "Jimmy John's": {
-                    "count": 119
+                "Робин Сдобин": {
+                    "count": 81
                 },
                 },
-                "Jollibee": {
-                    "count": 384
+                "Baskin Robbins": {
+                    "count": 69
                 },
                 },
-                "KFC": {
-                    "count": 2975,
+                "ケンタッキーフライドチキン": {
+                    "count": 162,
                     "tags": {
                     "tags": {
+                        "name:en": "KFC",
                         "cuisine": "chicken"
                     }
                 },
                         "cuisine": "chicken"
                     }
                 },
-                "Kebab": {
-                    "count": 167
+                "吉野家": {
+                    "count": 183
                 },
                 },
-                "Kochlöffel": {
-                    "count": 69
+                "Taco Time": {
+                    "count": 85
                 },
                 },
-                "Kotipizza": {
-                    "count": 75
+                "松屋": {
+                    "count": 262,
+                    "tags": {
+                        "name:en": "Matsuya"
+                    }
                 },
                 "Little Caesars": {
                 },
                 "Little Caesars": {
-                    "count": 61
+                    "count": 65
                 },
                 },
-                "Long John Silver's": {
-                    "count": 76
+                "El Pollo Loco": {
+                    "count": 62
                 },
                 },
-                "McDonald's": {
-                    "count": 11760,
+                "Del Taco": {
+                    "count": 139
+                },
+                "White Castle": {
+                    "count": 77
+                },
+                "Boston Market": {
+                    "count": 63
+                },
+                "Chick-fil-A": {
+                    "count": 236,
                     "tags": {
                     "tags": {
-                        "cuisine": "burger"
+                        "cuisine": "chicken"
                     }
                 },
                     }
                 },
-                "Mr. Sub": {
-                    "count": 108
+                "Panda Express": {
+                    "count": 225
                 },
                 },
-                "Nordsee": {
-                    "count": 159
+                "Whataburger": {
+                    "count": 152
                 },
                 },
-                "Panda Express": {
-                    "count": 212
+                "Taco John's": {
+                    "count": 72
                 },
                 },
-                "Papa John's": {
-                    "count": 274,
-                    "tags": {
-                        "cuisine": "pizza"
-                    }
+                "Теремок": {
+                    "count": 65
                 },
                 },
-                "Pizza Nova": {
-                    "count": 57
+                "Culver's": {
+                    "count": 426
                 },
                 },
-                "Pizza Pizza": {
-                    "count": 202
+                "Five Guys": {
+                    "count": 130
                 },
                 },
-                "Pollo Campero": {
-                    "count": 63
+                "Church's Chicken": {
+                    "count": 93
                 },
                 "Popeye's": {
                 },
                 "Popeye's": {
-                    "count": 147,
+                    "count": 151,
                     "tags": {
                         "cuisine": "chicken"
                     }
                 },
                     "tags": {
                         "cuisine": "chicken"
                     }
                 },
-                "Quick": {
-                    "count": 484
-                },
-                "Quiznos": {
-                    "count": 262,
-                    "tags": {
-                        "cuisine": "sandwich"
-                    }
-                },
-                "Red Rooster": {
-                    "count": 145
+                "Long John Silver's": {
+                    "count": 80
                 },
                 },
-                "Sibylla": {
+                "Pollo Campero": {
                     "count": 61
                 },
                     "count": 61
                 },
-                "Sonic": {
-                    "count": 506,
+                "すき家": {
+                    "count": 264,
                     "tags": {
                     "tags": {
-                        "cuisine": "burger"
+                        "name:en": "SUKIYA"
                     }
                 },
                     }
                 },
-                "Steers": {
-                    "count": 139
-                },
-                "Subway": {
-                    "count": 5113,
+                "モスバーガー": {
+                    "count": 252,
                     "tags": {
                     "tags": {
-                        "cuisine": "sandwich"
+                        "name:en": "MOS BURGER"
                     }
                 },
                     }
                 },
-                "Taco Bell": {
-                    "count": 1257
+                "Русский Аппетит": {
+                    "count": 67
                 },
                 },
-                "Taco John's": {
+                "なか卯": {
+                    "count": 56
+                }
+            },
+            "restaurant": {
+                "Pizza Hut": {
+                    "count": 1099
+                },
+                "Little Chef": {
                     "count": 64
                 },
                     "count": 64
                 },
-                "Taco Time": {
-                    "count": 82
+                "Adler": {
+                    "count": 158
                 },
                 },
-                "Telepizza": {
-                    "count": 188
+                "Zur Krone": {
+                    "count": 91
                 },
                 },
-                "Tim Hortons": {
-                    "count": 292
+                "Deutsches Haus": {
+                    "count": 91
                 },
                 },
-                "Wendy's": {
-                    "count": 1487,
-                    "tags": {
-                        "cuisine": "burger"
-                    }
+                "Krone": {
+                    "count": 173
                 },
                 },
-                "Whataburger": {
-                    "count": 147
+                "Akropolis": {
+                    "count": 150
                 },
                 },
-                "White Castle": {
-                    "count": 74
+                "Schützenhaus": {
+                    "count": 126
                 },
                 },
-                "Wimpy": {
-                    "count": 136
+                "TGI Friday's": {
+                    "count": 198
                 },
                 },
-                "Макдоналдс": {
-                    "count": 309,
-                    "tags": {
-                        "name:en": "McDonald's"
-                    }
+                "Kreuz": {
+                    "count": 73
                 },
                 },
-                "Робин Сдобин": {
-                    "count": 72
+                "Waldschänke": {
+                    "count": 56
                 },
                 },
-                "Русский Аппетит": {
-                    "count": 65
+                "La Piazza": {
+                    "count": 69
                 },
                 },
-                "Теремок": {
-                    "count": 63
+                "Lamm": {
+                    "count": 68
                 },
                 },
-                "すき家": {
-                    "count": 245,
-                    "tags": {
-                        "name:en": "SUKIYA"
-                    }
+                "Zur Sonne": {
+                    "count": 73
                 },
                 },
-                "なか卯": {
-                    "count": 52
+                "Zur Linde": {
+                    "count": 204
                 },
                 },
-                "ケンタッキーフライドチキン": {
-                    "count": 158,
-                    "tags": {
-                        "name:en": "KFC",
-                        "cuisine": "chicken"
-                    }
+                "Poseidon": {
+                    "count": 111
                 },
                 },
-                "マクドナルド": {
-                    "count": 632,
-                    "tags": {
-                        "name:en": "McDonald's",
-                        "cuisine": "burger"
-                    }
+                "Shanghai": {
+                    "count": 81
                 },
                 },
-                "モスバーガー": {
-                    "count": 237,
-                    "tags": {
-                        "name:en": "MOS BURGER"
-                    }
+                "Red Lobster": {
+                    "count": 224
                 },
                 },
-                "吉野家": {
-                    "count": 172
+                "Zum Löwen": {
+                    "count": 81
                 },
                 },
-                "松屋": {
-                    "count": 224,
+                "Swiss Chalet": {
+                    "count": 105
+                },
+                "Olympia": {
+                    "count": 77
+                },
+                "Wagamama": {
+                    "count": 59
+                },
+                "Frankie & Benny's": {
+                    "count": 62
+                },
+                "Hooters": {
+                    "count": 101
+                },
+                "Sternen": {
+                    "count": 76
+                },
+                "Hirschen": {
+                    "count": 82
+                },
+                "Papa John's": {
+                    "count": 58,
                     "tags": {
                     "tags": {
-                        "name:en": "Matsuya"
+                        "cuisine": "pizza"
                     }
                 },
                     }
                 },
-                "肯德基": {
-                    "count": 81
+                "Denny's": {
+                    "count": 422
                 },
                 },
-                "麥當勞": {
-                    "count": 51
-                }
-            },
-            "fuel": {
-                "76": {
-                    "count": 282
+                "Athen": {
+                    "count": 67
                 },
                 },
-                "1-2-3": {
-                    "count": 71
+                "Sonne": {
+                    "count": 124
                 },
                 },
-                "7-Eleven": {
-                    "count": 422
+                "Hirsch": {
+                    "count": 78
                 },
                 },
-                "ABC": {
-                    "count": 80
+                "Ratskeller": {
+                    "count": 149
                 },
                 },
-                "Agip": {
-                    "count": 2654
+                "La Cantina": {
+                    "count": 54
                 },
                 },
-                "ANP": {
-                    "count": 65
+                "Gasthaus Krone": {
+                    "count": 55
                 },
                 },
-                "ARAL": {
-                    "count": 371
+                "El Greco": {
+                    "count": 80
                 },
                 },
-                "Avia": {
-                    "count": 871
+                "Gasthof zur Post": {
+                    "count": 74
                 },
                 },
-                "Afriquia": {
-                    "count": 90
+                "Nando's": {
+                    "count": 234
                 },
                 },
-                "Agrola": {
-                    "count": 72
+                "Löwen": {
+                    "count": 114
                 },
                 },
-                "Api": {
-                    "count": 313
+                "Pizza Express": {
+                    "count": 250
                 },
                 },
-                "Aral": {
-                    "count": 1334
+                "Mandarin": {
+                    "count": 64
                 },
                 },
-                "Arco": {
-                    "count": 153
+                "Hong Kong": {
+                    "count": 83
                 },
                 },
-                "Auchan": {
-                    "count": 52
+                "Zizzi": {
+                    "count": 65
                 },
                 },
-                "Avanti": {
-                    "count": 92
+                "Cracker Barrel": {
+                    "count": 170
                 },
                 },
-                "BFT": {
-                    "count": 88
+                "Rhodos": {
+                    "count": 78
                 },
                 },
-                "BP": {
-                    "count": 2330
+                "Lindenhof": {
+                    "count": 80
                 },
                 },
-                "BR": {
+                "Milano": {
+                    "count": 53
+                },
+                "Dolce Vita": {
+                    "count": 75
+                },
+                "Kirchenwirt": {
                     "count": 81
                 },
                     "count": 81
                 },
-                "Benzina": {
-                    "count": 70
+                "Kantine": {
+                    "count": 56
                 },
                 },
-                "Bliska": {
-                    "count": 149
+                "Ochsen": {
+                    "count": 93
                 },
                 },
-                "C. C. E. Leclerc": {
-                    "count": 84
+                "Spur": {
+                    "count": 59
                 },
                 },
-                "CAMPSA": {
-                    "count": 630
+                "Mykonos": {
+                    "count": 59
                 },
                 },
-                "CARREFOUR": {
-                    "count": 75
+                "Lotus": {
+                    "count": 66
                 },
                 },
-                "CEPSA": {
-                    "count": 1020
+                "Applebee's": {
+                    "count": 501
                 },
                 },
-                "COSMO": {
-                    "count": 65
+                "Flunch": {
+                    "count": 71
                 },
                 },
-                "Caltex": {
-                    "count": 948
+                "Zur Post": {
+                    "count": 116
                 },
                 },
-                "Canadian Tire": {
-                    "count": 63
+                "China Town": {
+                    "count": 71
                 },
                 },
-                "Carrefour": {
-                    "count": 196
+                "La Dolce Vita": {
+                    "count": 68
                 },
                 },
-                "Casey's General Store": {
-                    "count": 162
+                "Waffle House": {
+                    "count": 195
                 },
                 },
-                "Cenex": {
-                    "count": 106
+                "Delphi": {
+                    "count": 88
                 },
                 },
-                "Cepsa": {
-                    "count": 75
+                "Linde": {
+                    "count": 102
                 },
                 },
-                "Chevron": {
-                    "count": 825
+                "Dionysos": {
+                    "count": 69
                 },
                 },
-                "Circle K": {
-                    "count": 149
+                "Outback Steakhouse": {
+                    "count": 199
                 },
                 },
-                "Citgo": {
-                    "count": 246
+                "Kelsey's": {
+                    "count": 55
                 },
                 },
-                "Coles Express": {
-                    "count": 99
+                "Boston Pizza": {
+                    "count": 153
                 },
                 },
-                "Conoco": {
-                    "count": 169
+                "Bella Italia": {
+                    "count": 129
                 },
                 },
-                "Coop": {
-                    "count": 55
+                "Sizzler": {
+                    "count": 52
                 },
                 },
-                "Copec": {
-                    "count": 496
+                "Grüner Baum": {
+                    "count": 115
                 },
                 },
-                "E.Leclerc": {
-                    "count": 250
+                "Taj Mahal": {
+                    "count": 102
                 },
                 },
-                "EKO": {
+                "Rössli": {
+                    "count": 67
+                },
+                "Traube": {
+                    "count": 64
+                },
+                "Red Robin": {
+                    "count": 177
+                },
+                "Roma": {
                     "count": 61
                 },
                     "count": 61
                 },
-                "ENEOS": {
-                    "count": 644
+                "San Marco": {
+                    "count": 66
                 },
                 },
-                "ERG": {
-                    "count": 74
+                "Hellas": {
+                    "count": 54
                 },
                 },
-                "Esso": {
-                    "count": 3566
+                "La Perla": {
+                    "count": 66
                 },
                 },
-                "Eko": {
-                    "count": 58
+                "Vips": {
+                    "count": 52
                 },
                 },
-                "Elan": {
-                    "count": 114
+                "Panera Bread": {
+                    "count": 192
                 },
                 },
-                "Elf": {
-                    "count": 138
+                "Da Vinci": {
+                    "count": 54
                 },
                 },
-                "Eneos": {
-                    "count": 97
+                "Hippopotamus": {
+                    "count": 92
                 },
                 },
-                "Engen": {
-                    "count": 224
+                "Prezzo": {
+                    "count": 71
                 },
                 },
-                "Eni": {
-                    "count": 199
+                "Courtepaille": {
+                    "count": 99
+                },
+                "Hard Rock Cafe": {
+                    "count": 67
+                },
+                "Panorama": {
+                    "count": 61
                 },
                 },
-                "Erg": {
-                    "count": 609
+                "デニーズ": {
+                    "count": 77
                 },
                 },
-                "Esso Express": {
-                    "count": 81
+                "Sportheim": {
+                    "count": 62
                 },
                 },
-                "Exxon": {
-                    "count": 435
+                "餃子の王将": {
+                    "count": 54
                 },
                 },
-                "Flying V": {
-                    "count": 130
+                "Bären": {
+                    "count": 55
                 },
                 },
-                "Freie Tankstelle": {
-                    "count": 210
+                "Alte Post": {
+                    "count": 61
                 },
                 },
-                "GALP": {
-                    "count": 582
+                "China Garden": {
+                    "count": 64
                 },
                 },
-                "Gulf": {
-                    "count": 184
+                "Vapiano": {
+                    "count": 82
                 },
                 },
-                "HEM": {
-                    "count": 216
+                "Mamma Mia": {
+                    "count": 60
                 },
                 },
-                "HP": {
-                    "count": 59
+                "Schwarzer Adler": {
+                    "count": 56
                 },
                 },
-                "Hess": {
-                    "count": 110
+                "IHOP": {
+                    "count": 304
                 },
                 },
-                "Holiday": {
-                    "count": 96
+                "Chili's": {
+                    "count": 308
                 },
                 },
-                "Husky": {
-                    "count": 115
+                "Olive Garden": {
+                    "count": 264
                 },
                 },
-                "IDEMITSU": {
-                    "count": 79
+                "Friendly's": {
+                    "count": 75
                 },
                 },
-                "IES": {
-                    "count": 62
+                "Buffalo Grill": {
+                    "count": 196
                 },
                 },
-                "INA": {
-                    "count": 118
+                "Texas Roadhouse": {
+                    "count": 103
                 },
                 },
-                "IP": {
-                    "count": 830
+                "ガスト": {
+                    "count": 221,
+                    "tags": {
+                        "name:en": "Gusto"
+                    }
                 },
                 },
-                "Indian Oil": {
-                    "count": 134
+                "Sakura": {
+                    "count": 70
                 },
                 },
-                "Indipend.": {
-                    "count": 178
+                "Mensa": {
+                    "count": 92
                 },
                 },
-                "Intermarché": {
-                    "count": 417
+                "The Keg": {
+                    "count": 52
                 },
                 },
-                "Ipiranga": {
-                    "count": 79
+                "サイゼリヤ": {
+                    "count": 88
                 },
                 },
-                "Irving": {
-                    "count": 79
+                "La Strada": {
+                    "count": 51
                 },
                 },
-                "JET": {
-                    "count": 177
+                "Village Inn": {
+                    "count": 89
                 },
                 },
-                "JOMO": {
-                    "count": 65
+                "Buffalo Wild Wings": {
+                    "count": 161
                 },
                 },
-                "Jet": {
-                    "count": 439
+                "Peking": {
+                    "count": 56
                 },
                 },
-                "Kum & Go": {
-                    "count": 76
+                "Boston Market": {
+                    "count": 60
                 },
                 },
-                "Kwik Trip": {
-                    "count": 100
+                "Jimmy John's": {
+                    "count": 53
                 },
                 },
-                "LPG": {
-                    "count": 151
+                "California Pizza Kitchen": {
+                    "count": 56
                 },
                 },
-                "Lotos": {
-                    "count": 168
+                "Якитория": {
+                    "count": 77
                 },
                 },
-                "Lukoil": {
-                    "count": 667
+                "Golden Corral": {
+                    "count": 97
                 },
                 },
-                "MEROIL": {
-                    "count": 80
+                "Perkins": {
+                    "count": 101
                 },
                 },
-                "MOL": {
-                    "count": 216
+                "Ruby Tuesday": {
+                    "count": 146
                 },
                 },
-                "Marathon": {
-                    "count": 154
+                "Shari's": {
+                    "count": 63
                 },
                 },
-                "Metano": {
-                    "count": 205
+                "Bob Evans": {
+                    "count": 112
                 },
                 },
-                "Migrol": {
-                    "count": 66
+                "바다횟집 (Bada Fish Restaurant)": {
+                    "count": 54
                 },
                 },
-                "Mobil": {
-                    "count": 564
+                "Mang Inasal": {
+                    "count": 82
                 },
                 },
-                "Mol": {
-                    "count": 58
+                "Евразия": {
+                    "count": 99
                 },
                 },
-                "Morrisons": {
-                    "count": 104
+                "ジョナサン": {
+                    "count": 57
                 },
                 },
-                "Neste": {
-                    "count": 197
+                "Longhorn Steakhouse": {
+                    "count": 63
+                }
+            },
+            "bank": {
+                "Chase": {
+                    "count": 667
                 },
                 },
-                "Neste A24": {
-                    "count": 58
+                "Commonwealth Bank": {
+                    "count": 224
                 },
                 },
-                "OIL!": {
-                    "count": 57
+                "Citibank": {
+                    "count": 261
                 },
                 },
-                "OK": {
-                    "count": 159
+                "HSBC": {
+                    "count": 1072
                 },
                 },
-                "OKKO": {
-                    "count": 56
+                "Barclays": {
+                    "count": 947
                 },
                 },
-                "OKQ8": {
-                    "count": 186
+                "Westpac": {
+                    "count": 200
                 },
                 },
-                "OMV": {
-                    "count": 718
+                "NAB": {
+                    "count": 126
                 },
                 },
-                "Oilibya": {
-                    "count": 65
+                "ANZ": {
+                    "count": 207
                 },
                 },
-                "Orlen": {
-                    "count": 541
+                "Lloyds Bank": {
+                    "count": 543
                 },
                 },
-                "Pemex": {
-                    "count": 357
+                "Landbank": {
+                    "count": 80
                 },
                 },
-                "PETRONOR": {
-                    "count": 209
+                "Sparkasse": {
+                    "count": 4526
                 },
                 },
-                "PTT": {
-                    "count": 175
+                "UCPB": {
+                    "count": 90
                 },
                 },
-                "Pertamina": {
-                    "count": 176
+                "PNB": {
+                    "count": 243
                 },
                 },
-                "Petro-Canada": {
-                    "count": 466
+                "Metrobank": {
+                    "count": 264
                 },
                 },
-                "Petrobras": {
-                    "count": 256
+                "BDO": {
+                    "count": 288
                 },
                 },
-                "Petrom": {
-                    "count": 253
+                "Volksbank": {
+                    "count": 2584
                 },
                 },
-                "Petron": {
-                    "count": 824
+                "BPI": {
+                    "count": 402
                 },
                 },
-                "Petronas": {
-                    "count": 143
+                "Postbank": {
+                    "count": 440
                 },
                 },
-                "Phillips 66": {
-                    "count": 193
+                "NatWest": {
+                    "count": 620
                 },
                 },
-                "Phoenix": {
-                    "count": 138
+                "Raiffeisenbank": {
+                    "count": 2072
                 },
                 },
-                "Q8": {
-                    "count": 1137
+                "Yorkshire Bank": {
+                    "count": 63
                 },
                 },
-                "QuikTrip": {
-                    "count": 84
+                "ABSA": {
+                    "count": 90
                 },
                 },
-                "REPSOL": {
-                    "count": 1610
+                "Standard Bank": {
+                    "count": 101
                 },
                 },
-                "Raiffeisenbank": {
-                    "count": 118
+                "FNB": {
+                    "count": 92
                 },
                 },
-                "Repsol": {
-                    "count": 390
+                "Deutsche Bank": {
+                    "count": 846
                 },
                 },
-                "Rompetrol": {
-                    "count": 161
+                "SEB": {
+                    "count": 131
                 },
                 },
-                "Shell": {
-                    "count": 7936
+                "Commerzbank": {
+                    "count": 802
                 },
                 },
-                "Sainsbury's": {
-                    "count": 55
+                "Targobank": {
+                    "count": 166
                 },
                 },
-                "Sasol": {
-                    "count": 55
+                "ABN AMRO": {
+                    "count": 129
                 },
                 },
-                "Sheetz": {
-                    "count": 95
+                "Handelsbanken": {
+                    "count": 181
                 },
                 },
-                "Shell Express": {
-                    "count": 133
+                "Swedbank": {
+                    "count": 221
                 },
                 },
-                "Sinclair": {
-                    "count": 78
+                "Kreissparkasse": {
+                    "count": 587
                 },
                 },
-                "Slovnaft": {
-                    "count": 217
+                "UniCredit Bank": {
+                    "count": 400
                 },
                 },
-                "Sokimex": {
-                    "count": 59
+                "Monte dei Paschi di Siena": {
+                    "count": 131
                 },
                 },
-                "Speedway": {
-                    "count": 124
+                "Caja Rural": {
+                    "count": 94
                 },
                 },
-                "St1": {
-                    "count": 100
+                "Dresdner Bank": {
+                    "count": 72
                 },
                 },
-                "Stacja paliw": {
-                    "count": 84
+                "Sparda-Bank": {
+                    "count": 315
                 },
                 },
-                "Star": {
-                    "count": 316
+                "VÚB": {
+                    "count": 106
                 },
                 },
-                "Total": {
-                    "count": 2498
+                "Slovenská sporiteľňa": {
+                    "count": 130
                 },
                 },
-                "Statoil": {
-                    "count": 588
+                "Bank of Montreal": {
+                    "count": 115
                 },
                 },
-                "Stewart's": {
-                    "count": 62
+                "KBC": {
+                    "count": 198
                 },
                 },
-                "Sunoco": {
-                    "count": 307
+                "Royal Bank of Scotland": {
+                    "count": 109
                 },
                 },
-                "Super U": {
-                    "count": 122
+                "TSB": {
+                    "count": 71
                 },
                 },
-                "Tamoil": {
-                    "count": 864
+                "US Bank": {
+                    "count": 234
                 },
                 },
-                "Tango": {
-                    "count": 119
+                "HypoVereinsbank": {
+                    "count": 565
                 },
                 },
-                "Tankstelle": {
-                    "count": 114
+                "Bank Austria": {
+                    "count": 172
                 },
                 },
-                "Teboil": {
-                    "count": 119
+                "ING": {
+                    "count": 482
                 },
                 },
-                "Tela": {
-                    "count": 113
+                "Erste Bank": {
+                    "count": 180
                 },
                 },
-                "Terpel": {
-                    "count": 255
+                "CIBC": {
+                    "count": 321
                 },
                 },
-                "Tesco": {
-                    "count": 192
+                "Scotiabank": {
+                    "count": 392
                 },
                 },
-                "Texaco": {
-                    "count": 645
+                "Caisse d'Épargne": {
+                    "count": 849
                 },
                 },
-                "Tinq": {
-                    "count": 218
+                "Santander": {
+                    "count": 1254
                 },
                 },
-                "Topaz": {
-                    "count": 78
+                "Bank of Scotland": {
+                    "count": 87
                 },
                 },
-                "TotalErg": {
-                    "count": 71
+                "TD Canada Trust": {
+                    "count": 437
                 },
                 },
-                "Turmöl": {
-                    "count": 57
+                "BMO": {
+                    "count": 166
                 },
                 },
-                "Ultramar": {
-                    "count": 119
+                "Danske Bank": {
+                    "count": 130
                 },
                 },
-                "United": {
-                    "count": 83
+                "OTP": {
+                    "count": 189
                 },
                 },
-                "Valero": {
-                    "count": 328
+                "Crédit Agricole": {
+                    "count": 1200
                 },
                 },
-                "WOG": {
-                    "count": 139
+                "LCL": {
+                    "count": 528
                 },
                 },
-                "Wawa": {
-                    "count": 78
+                "VR-Bank": {
+                    "count": 427
                 },
                 },
-                "Westfalen": {
-                    "count": 97
+                "ČSOB": {
+                    "count": 160
                 },
                 },
-                "YPF": {
-                    "count": 141
+                "Česká spořitelna": {
+                    "count": 211
                 },
                 },
-                "Z": {
-                    "count": 76
+                "BNP": {
+                    "count": 109
                 },
                 },
-                "bft": {
-                    "count": 168
+                "Royal Bank": {
+                    "count": 65
                 },
                 },
-                "ÖMV": {
-                    "count": 100
+                "Nationwide": {
+                    "count": 200
                 },
                 },
-                "АГЗС": {
-                    "count": 471
+                "Halifax": {
+                    "count": 219
                 },
                 },
-                "АЗС": {
-                    "count": 1012
+                "BAWAG PSK": {
+                    "count": 101
                 },
                 },
-                "Башнефть": {
-                    "count": 52
+                "National Bank": {
+                    "count": 84
                 },
                 },
-                "Белоруснефть": {
-                    "count": 55
+                "Nedbank": {
+                    "count": 78
                 },
                 },
-                "Газпромнефть": {
-                    "count": 727
+                "First National Bank": {
+                    "count": 76
                 },
                 },
-                "Лукойл": {
-                    "count": 1472
+                "Nordea": {
+                    "count": 313
                 },
                 },
-                "Макпетрол": {
-                    "count": 110
+                "Rabobank": {
+                    "count": 613
                 },
                 },
-                "НК Альянс": {
-                    "count": 89
+                "Sparkasse KölnBonn": {
+                    "count": 53
                 },
                 },
-                "ОККО": {
-                    "count": 112
+                "Tatra banka": {
+                    "count": 67
                 },
                 },
-                "ОМВ": {
-                    "count": 57
+                "Berliner Sparkasse": {
+                    "count": 61
                 },
                 },
-                "ПТК": {
-                    "count": 82
+                "Berliner Volksbank": {
+                    "count": 77
                 },
                 },
-                "Петрол": {
-                    "count": 82
+                "Wells Fargo": {
+                    "count": 822
                 },
                 },
-                "Роснефть": {
-                    "count": 594
+                "Credit Suisse": {
+                    "count": 70
                 },
                 },
-                "Славнефть": {
-                    "count": 53
+                "Société Générale": {
+                    "count": 615
                 },
                 },
-                "Сургутнефтегаз": {
-                    "count": 60
+                "Osuuspankki": {
+                    "count": 73
                 },
                 },
-                "ТНК": {
-                    "count": 503
+                "Sparkasse Aachen": {
+                    "count": 56
                 },
                 },
-                "Татнефтепродукт": {
-                    "count": 55
+                "Hamburger Sparkasse": {
+                    "count": 155
                 },
                 },
-                "Татнефть": {
-                    "count": 250
+                "Cassa di Risparmio del Veneto": {
+                    "count": 66
                 },
                 },
-                "บางจาก": {
-                    "count": 60
+                "BNP Paribas": {
+                    "count": 598
                 },
                 },
-                "ป ต ท": {
-                    "count": 154
+                "Banque Populaire": {
+                    "count": 411
                 },
                 },
-                "ปตท": {
-                    "count": 89
+                "BNP Paribas Fortis": {
+                    "count": 208
                 },
                 },
-                "コスモ石油 (COSMO)": {
-                    "count": 132
+                "Banco Popular": {
+                    "count": 272
                 },
                 },
-                "出光": {
-                    "count": 205,
-                    "tags": {
-                        "name:en": "IDEMITSU"
-                    }
+                "Bancaja": {
+                    "count": 55
                 },
                 },
-                "昭和シェル (Showa-shell)": {
-                    "count": 93
-                }
-            },
-            "pharmacy": {
-                "Аптека 36,6": {
-                    "count": 220
+                "Banesto": {
+                    "count": 207
                 },
                 },
-                "Adler Apotheke": {
-                    "count": 302
+                "La Caixa": {
+                    "count": 553
                 },
                 },
-                "Alte Apotheke": {
-                    "count": 85
+                "Santander Consumer Bank": {
+                    "count": 83
                 },
                 },
-                "Apotheke": {
-                    "count": 167
+                "BRD": {
+                    "count": 188
                 },
                 },
-                "Apotheke am Markt": {
-                    "count": 62
+                "BCR": {
+                    "count": 140
                 },
                 },
-                "Apteka": {
-                    "count": 335
+                "Banca Transilvania": {
+                    "count": 139
                 },
                 },
-                "Bahnhof-Apotheke": {
-                    "count": 64
+                "BW-Bank": {
+                    "count": 97
                 },
                 },
-                "Boots": {
-                    "count": 809
+                "Komerční banka": {
+                    "count": 133
                 },
                 },
-                "Brunnen-Apotheke": {
-                    "count": 52
+                "Banco Pastor": {
+                    "count": 64
                 },
                 },
-                "Burg-Apotheke": {
-                    "count": 56
+                "Stadtsparkasse": {
+                    "count": 86
                 },
                 },
-                "Bären-Apotheke": {
-                    "count": 72
+                "Ulster Bank": {
+                    "count": 88
                 },
                 },
-                "CVS": {
-                    "count": 1400
+                "Sberbank": {
+                    "count": 59
                 },
                 },
-                "Clicks": {
-                    "count": 110
+                "CIC": {
+                    "count": 411
                 },
                 },
-                "Cruz Verde": {
-                    "count": 96
+                "Bancpost": {
+                    "count": 53
                 },
                 },
-                "Engel-Apotheke": {
-                    "count": 126
+                "Caja Madrid": {
+                    "count": 114
                 },
                 },
-                "Eurovaistinė": {
-                    "count": 60
+                "Maybank": {
+                    "count": 88
                 },
                 },
-                "Farmacia Comunale": {
-                    "count": 103
+                "中国银行": {
+                    "count": 70
                 },
                 },
-                "Farmacias Ahumada": {
-                    "count": 101
+                "Unicredit Banca": {
+                    "count": 233
                 },
                 },
-                "Farmacias Cruz Verde": {
-                    "count": 84
+                "Crédit Mutuel": {
+                    "count": 666
                 },
                 },
-                "Farmacias SalcoBrand": {
-                    "count": 133
+                "BBVA": {
+                    "count": 614
                 },
                 },
-                "Farmacity": {
+                "Intesa San Paolo": {
                     "count": 62
                 },
                     "count": 62
                 },
-                "Farmahorro": {
-                    "count": 61
+                "TD Bank": {
+                    "count": 184
                 },
                 },
-                "Farmatodo": {
-                    "count": 133
+                "Belfius": {
+                    "count": 227
                 },
                 },
-                "Gintarinė vaistinė": {
-                    "count": 100
+                "Bank of America": {
+                    "count": 877
                 },
                 },
-                "Hirsch-Apotheke": {
-                    "count": 80
+                "RBC": {
+                    "count": 224
                 },
                 },
-                "Hubertus Apotheke": {
+                "Alpha Bank": {
                     "count": 103
                 },
                     "count": 103
                 },
-                "Jean Coutu": {
-                    "count": 56
+                "Сбербанк": {
+                    "count": 4703
                 },
                 },
-                "Kinney Drugs": {
-                    "count": 67
+                "Россельхозбанк": {
+                    "count": 192
                 },
                 },
-                "Linden-Apotheke": {
-                    "count": 210
+                "Crédit du Nord": {
+                    "count": 91
                 },
                 },
-                "Ljekarna": {
-                    "count": 55
+                "BancoEstado": {
+                    "count": 79
                 },
                 },
-                "Lloyds Pharmacy": {
-                    "count": 286
+                "Millennium Bank": {
+                    "count": 415
                 },
                 },
-                "Löwen-Apotheke": {
-                    "count": 354
+                "State Bank of India": {
+                    "count": 141
                 },
                 },
-                "Marien-Apotheke": {
-                    "count": 315
+                "Беларусбанк": {
+                    "count": 233
                 },
                 },
-                "Markt-Apotheke": {
-                    "count": 161
+                "ING Bank Śląski": {
+                    "count": 65
                 },
                 },
-                "Mercury Drug": {
-                    "count": 401
+                "Caixa Geral de Depósitos": {
+                    "count": 124
                 },
                 },
-                "Neue Apotheke": {
-                    "count": 111
+                "Kreissparkasse Köln": {
+                    "count": 67
                 },
                 },
-                "Pharmacie Centrale": {
-                    "count": 60
+                "Banco BCI": {
+                    "count": 51
                 },
                 },
-                "Pharmaprix": {
-                    "count": 57
+                "Banco de Chile": {
+                    "count": 96
                 },
                 },
-                "Pharmasave": {
-                    "count": 63
+                "ВТБ24": {
+                    "count": 316
                 },
                 },
-                "Rathaus-Apotheke": {
-                    "count": 130
+                "UBS": {
+                    "count": 131
                 },
                 },
-                "Rats-Apotheke": {
-                    "count": 85
+                "PKO BP": {
+                    "count": 249
                 },
                 },
-                "Rite Aid": {
-                    "count": 659
+                "Chinabank": {
+                    "count": 54
                 },
                 },
-                "Rosen-Apotheke": {
-                    "count": 208
+                "PSBank": {
+                    "count": 57
                 },
                 },
-                "Rowlands Pharmacy": {
-                    "count": 68
+                "Union Bank": {
+                    "count": 118
                 },
                 },
-                "SalcoBrand": {
-                    "count": 88
+                "China Bank": {
+                    "count": 63
                 },
                 },
-                "Shoppers Drug Mart": {
-                    "count": 396
+                "RCBC": {
+                    "count": 122
                 },
                 },
-                "Sonnen-Apotheke": {
-                    "count": 306
+                "Unicaja": {
+                    "count": 78
                 },
                 },
-                "Stadt-Apotheke": {
-                    "count": 300
+                "BBK": {
+                    "count": 77
                 },
                 },
-                "Stern-Apotheke": {
-                    "count": 67
+                "Ibercaja": {
+                    "count": 66
                 },
                 },
-                "Superdrug": {
+                "RBS": {
+                    "count": 140
+                },
+                "Commercial Bank of Ceylon PLC": {
+                    "count": 79
+                },
+                "Bank of Ireland": {
                     "count": 108
                 },
                     "count": 108
                 },
-                "The Generics Pharmacy": {
-                    "count": 82
+                "BNL": {
+                    "count": 80
                 },
                 },
-                "Walgreens": {
-                    "count": 1447
+                "Banco Santander": {
+                    "count": 106
                 },
                 },
-                "Айболит": {
-                    "count": 51
+                "Banco Itaú": {
+                    "count": 94
                 },
                 },
-                "Аптека": {
-                    "count": 1879
+                "AIB": {
+                    "count": 70
                 },
                 },
-                "Аптечный пункт": {
-                    "count": 136
+                "BZ WBK": {
+                    "count": 72
                 },
                 },
-                "Вита": {
-                    "count": 107
+                "Banco do Brasil": {
+                    "count": 494
                 },
                 },
-                "Имплозия": {
-                    "count": 59
+                "Caixa Econômica Federal": {
+                    "count": 155
                 },
                 },
-                "Классика": {
-                    "count": 66
+                "Fifth Third Bank": {
+                    "count": 71
                 },
                 },
-                "Невис": {
-                    "count": 58
+                "Banca Popolare di Vicenza": {
+                    "count": 77
                 },
                 },
-                "Первая помощь": {
+                "Wachovia": {
+                    "count": 60
+                },
+                "OLB": {
+                    "count": 51
+                },
+                "みずほ銀行": {
                     "count": 73
                 },
                     "count": 73
                 },
-                "Радуга": {
+                "BES": {
                     "count": 69
                 },
                     "count": 69
                 },
-                "Ригла": {
-                    "count": 109
+                "ICICI Bank": {
+                    "count": 88
                 },
                 },
-                "Фармакор": {
-                    "count": 71
+                "HDFC Bank": {
+                    "count": 89
                 },
                 },
-                "Фармация": {
-                    "count": 118
+                "La Banque Postale": {
+                    "count": 63
                 },
                 },
-                "Фармленд": {
-                    "count": 80
+                "Pekao SA": {
+                    "count": 53
                 },
                 },
-                "аптека": {
-                    "count": 100
+                "Oberbank": {
+                    "count": 88
                 },
                 },
-                "ავერსი (Aversi)": {
-                    "count": 63
+                "Bradesco": {
+                    "count": 272
                 },
                 },
-                "サンドラッグ": {
+                "Oldenburgische Landesbank": {
+                    "count": 55
+                },
+                "Scotia Bank": {
                     "count": 52
                 },
                     "count": 52
                 },
-                "スギ薬局": {
-                    "count": 76
+                "Bendigo Bank": {
+                    "count": 89
                 },
                 },
-                "トモズ (Tomod's)": {
-                    "count": 82
+                "Argenta": {
+                    "count": 85
                 },
                 },
-                "ドラッグてらしま (Drug Terashima)": {
-                    "count": 96
+                "AXA": {
+                    "count": 68
                 },
                 },
-                "マツモトキヨシ": {
-                    "count": 107
-                }
-            },
-            "pub": {
-                "Cross Keys": {
-                    "count": 59
+                "Axis Bank": {
+                    "count": 58
                 },
                 },
-                "Irish Pub": {
-                    "count": 82
+                "Banco Nación": {
+                    "count": 61
                 },
                 },
-                "Kings Arms": {
-                    "count": 68
+                "GE Money Bank": {
+                    "count": 71
                 },
                 },
-                "Kings Head": {
-                    "count": 56
+                "Альфа-Банк": {
+                    "count": 182
                 },
                 },
-                "New Inn": {
-                    "count": 89
+                "Белагропромбанк": {
+                    "count": 67
                 },
                 },
-                "Prince of Wales": {
-                    "count": 76
+                "Caja Círculo": {
+                    "count": 64
                 },
                 },
-                "Red Lion": {
-                    "count": 201
+                "Eurobank": {
+                    "count": 91
                 },
                 },
-                "Rose & Crown": {
-                    "count": 51
+                "Banca Intesa": {
+                    "count": 55
                 },
                 },
-                "Rose and Crown": {
-                    "count": 77
+                "Canara Bank": {
+                    "count": 86
                 },
                 },
-                "Royal Hotel": {
-                    "count": 52
+                "Cajamar": {
+                    "count": 68
                 },
                 },
-                "Royal Oak": {
-                    "count": 149
+                "Banamex": {
+                    "count": 138
                 },
                 },
-                "The Anchor": {
-                    "count": 64
+                "Crédit Mutuel de Bretagne": {
+                    "count": 335
                 },
                 },
-                "The Angel": {
+                "Davivienda": {
+                    "count": 81
+                },
+                "Bank Spółdzielczy": {
+                    "count": 148
+                },
+                "Credit Agricole": {
+                    "count": 151
+                },
+                "Bankinter": {
                     "count": 55
                 },
                     "count": 55
                 },
-                "The Bell": {
-                    "count": 121
+                "Banque Nationale": {
+                    "count": 62
                 },
                 },
-                "The Black Horse": {
-                    "count": 94
+                "Bank of the West": {
+                    "count": 91
                 },
                 },
-                "The Bull": {
-                    "count": 67
+                "Key Bank": {
+                    "count": 144
                 },
                 },
-                "The Castle": {
-                    "count": 56
+                "Western Union": {
+                    "count": 86
                 },
                 },
-                "The Chequers": {
-                    "count": 65
+                "Citizens Bank": {
+                    "count": 110
                 },
                 },
-                "The Cross Keys": {
-                    "count": 55
+                "ПриватБанк": {
+                    "count": 492
                 },
                 },
-                "The Crown": {
-                    "count": 239
+                "Security Bank": {
+                    "count": 72
                 },
                 },
-                "The Crown Inn": {
-                    "count": 69
+                "Ecobank": {
+                    "count": 63
                 },
                 },
-                "The Fox": {
-                    "count": 78
+                "Millenium Bank": {
+                    "count": 61
                 },
                 },
-                "The George": {
+                "Bankia": {
+                    "count": 127
+                },
+                "三菱東京UFJ銀行": {
+                    "count": 159
+                },
+                "Caixa": {
                     "count": 109
                 },
                     "count": 109
                 },
-                "The Green Man": {
+                "Banco de Costa Rica": {
+                    "count": 62
+                },
+                "SunTrust Bank": {
+                    "count": 69
+                },
+                "Itaú": {
+                    "count": 313
+                },
+                "PBZ": {
                     "count": 52
                 },
                     "count": 52
                 },
-                "The Greyhound": {
-                    "count": 97
+                "Bancolombia": {
+                    "count": 87
                 },
                 },
-                "The Kings Arms": {
-                    "count": 59
+                "Райффайзен Банк Аваль": {
+                    "count": 62
                 },
                 },
-                "The Kings Head": {
-                    "count": 54
+                "Bancomer": {
+                    "count": 102
                 },
                 },
-                "The New Inn": {
-                    "count": 105
+                "Banorte": {
+                    "count": 74
                 },
                 },
-                "The Plough": {
-                    "count": 173
+                "Alior Bank": {
+                    "count": 76
                 },
                 },
-                "The Prince of Wales": {
+                "BOC": {
                     "count": 51
                 },
                     "count": 51
                 },
-                "The Queens Head": {
-                    "count": 51
+                "Банк Москвы": {
+                    "count": 116
                 },
                 },
-                "The Railway": {
-                    "count": 100
+                "ВТБ": {
+                    "count": 57
                 },
                 },
-                "The Red Lion": {
-                    "count": 230
+                "Caja Duero": {
+                    "count": 58
                 },
                 },
-                "The Rising Sun": {
+                "Regions Bank": {
+                    "count": 61
+                },
+                "Росбанк": {
+                    "count": 177
+                },
+                "Banco Estado": {
                     "count": 70
                 },
                     "count": 70
                 },
-                "The Royal Oak": {
-                    "count": 207
+                "BCI": {
+                    "count": 63
                 },
                 },
-                "The Ship": {
-                    "count": 89
+                "SunTrust": {
+                    "count": 64
                 },
                 },
-                "The Ship Inn": {
-                    "count": 80
+                "PNC Bank": {
+                    "count": 232
                 },
                 },
-                "The Star": {
-                    "count": 74
+                "신한은행": {
+                    "count": 218,
+                    "tags": {
+                        "name:en": "Sinhan Bank"
+                    }
                 },
                 },
-                "The Swan": {
-                    "count": 148
+                "우리은행": {
+                    "count": 292,
+                    "tags": {
+                        "name:en": "Uri Bank"
+                    }
                 },
                 },
-                "The Victoria": {
-                    "count": 68
+                "국민은행": {
+                    "count": 166,
+                    "tags": {
+                        "name:en": "Gungmin Bank"
+                    }
                 },
                 },
-                "The Wheatsheaf": {
-                    "count": 120
+                "중소기업은행": {
+                    "count": 52,
+                    "tags": {
+                        "name:en": "Industrial Bank of Korea"
+                    }
                 },
                 },
-                "The White Hart": {
-                    "count": 223
+                "광주은행": {
+                    "count": 53,
+                    "tags": {
+                        "name:en": "Gwangju Bank"
+                    }
                 },
                 },
-                "The White Horse": {
-                    "count": 201
+                "Газпромбанк": {
+                    "count": 99
                 },
                 },
-                "The White Lion": {
-                    "count": 117
-                }
-            },
-            "recycling": {
-                "Altglas": {
-                    "count": 98
+                "M&T Bank": {
+                    "count": 85
                 },
                 },
-                "Déchèterie": {
-                    "count": 244
+                "Caja de Burgos": {
+                    "count": 52
                 },
                 },
-                "Glas": {
-                    "count": 106
+                "Santander Totta": {
+                    "count": 63
                 },
                 },
-                "Glascontainer": {
-                    "count": 144
+                "УкрСиббанк": {
+                    "count": 128
                 },
                 },
-                "Recyclinghof": {
-                    "count": 131
+                "Ощадбанк": {
+                    "count": 313
                 },
                 },
-                "Wertstoffhof": {
-                    "count": 262
-                }
-            },
-            "restaurant": {
-                "Adler": {
-                    "count": 154
+                "Уралсиб": {
+                    "count": 84
                 },
                 },
-                "Akropolis": {
-                    "count": 149
+                "りそな銀行": {
+                    "count": 227,
+                    "tags": {
+                        "name:en": "Mizuho Bank"
+                    }
                 },
                 },
-                "Alte Post": {
-                    "count": 62
+                "Cajero Automatico Bancared": {
+                    "count": 145
                 },
                 },
-                "Applebee's": {
-                    "count": 467
+                "Промсвязьбанк": {
+                    "count": 89
                 },
                 },
-                "Athen": {
-                    "count": 65
+                "三井住友銀行": {
+                    "count": 126
                 },
                 },
-                "Bella Italia": {
-                    "count": 125
+                "Banco Provincia": {
+                    "count": 65
                 },
                 },
-                "Bob Evans": {
-                    "count": 99
+                "BB&T": {
+                    "count": 136
                 },
                 },
-                "Boston Market": {
+                "Возрождение": {
                     "count": 57
                 },
                     "count": 57
                 },
-                "Boston Pizza": {
-                    "count": 148
+                "Capital One": {
+                    "count": 52
                 },
                 },
-                "Buffalo Grill": {
-                    "count": 192
+                "Bank Mandiri": {
+                    "count": 59
                 },
                 },
-                "Buffalo Wild Wings": {
-                    "count": 147
+                "Banco de la Nación": {
+                    "count": 93
                 },
                 },
-                "Bären": {
+                "Banco G&T Continental": {
+                    "count": 62
+                },
+                "Peoples Bank": {
                     "count": 58
                 },
                     "count": 58
                 },
-                "California Pizza Kitchen": {
+                "Совкомбанк": {
+                    "count": 52
+                },
+                "Provincial": {
+                    "count": 53
+                },
+                "Banco de Desarrollo Banrural": {
+                    "count": 73
+                },
+                "Banco Bradesco": {
                     "count": 56
                 },
                     "count": 56
                 },
-                "Chili's": {
-                    "count": 294
+                "Bicentenario": {
+                    "count": 182
                 },
                 },
-                "China Garden": {
-                    "count": 64
+                "ლიბერთი ბანკი": {
+                    "count": 54,
+                    "tags": {
+                        "name:en": "Liberty Bank"
+                    }
                 },
                 },
-                "China Town": {
-                    "count": 70
+                "Banesco": {
+                    "count": 106
                 },
                 },
-                "Courtepaille": {
-                    "count": 95
+                "Mercantil": {
+                    "count": 76
                 },
                 },
-                "Cracker Barrel": {
-                    "count": 162
+                "Del Tesoro": {
+                    "count": 91
+                },
+                "하나은행": {
+                    "count": 77
+                },
+                "CityCommerce Bank": {
+                    "count": 53
+                },
+                "De Venezuela": {
+                    "count": 118
+                }
+            },
+            "car_rental": {
+                "Europcar": {
+                    "count": 287
                 },
                 },
-                "Da Vinci": {
-                    "count": 53
+                "Budget": {
+                    "count": 85
                 },
                 },
-                "Delphi": {
-                    "count": 86
+                "Sixt": {
+                    "count": 151
                 },
                 },
-                "Denny's": {
-                    "count": 395
+                "Avis": {
+                    "count": 276
                 },
                 },
-                "Deutsches Haus": {
-                    "count": 88
+                "Hertz": {
+                    "count": 286
                 },
                 },
-                "Dionysos": {
-                    "count": 68
+                "Enterprise": {
+                    "count": 184
                 },
                 },
-                "Dolce Vita": {
-                    "count": 74
+                "stadtmobil CarSharing-Station": {
+                    "count": 149
+                }
+            },
+            "pharmacy": {
+                "Rowlands Pharmacy": {
+                    "count": 69
                 },
                 },
-                "El Greco": {
-                    "count": 80
+                "Boots": {
+                    "count": 819
                 },
                 },
-                "Flunch": {
-                    "count": 71
+                "Marien-Apotheke": {
+                    "count": 314
                 },
                 },
-                "Frankie & Benny's": {
-                    "count": 58
+                "Mercury Drug": {
+                    "count": 412
                 },
                 },
-                "Friendly's": {
-                    "count": 72
+                "Löwen-Apotheke": {
+                    "count": 354
                 },
                 },
-                "Gasthaus Adler": {
-                    "count": 51
+                "Superdrug": {
+                    "count": 109
                 },
                 },
-                "Gasthaus Krone": {
-                    "count": 54
+                "Sonnen-Apotheke": {
+                    "count": 306
                 },
                 },
-                "Gasthof zur Post": {
-                    "count": 72
+                "Rathaus-Apotheke": {
+                    "count": 131
                 },
                 },
-                "Golden Corral": {
-                    "count": 91
+                "Engel-Apotheke": {
+                    "count": 123
                 },
                 },
-                "Grüner Baum": {
-                    "count": 116
+                "Hirsch-Apotheke": {
+                    "count": 82
                 },
                 },
-                "Hard Rock Cafe": {
+                "Stern-Apotheke": {
                     "count": 66
                 },
                     "count": 66
                 },
-                "Hellas": {
-                    "count": 54
+                "Lloyds Pharmacy": {
+                    "count": 292
                 },
                 },
-                "Hippopotamus": {
-                    "count": 91
+                "Rosen-Apotheke": {
+                    "count": 207
                 },
                 },
-                "Hirsch": {
-                    "count": 77
+                "Stadt-Apotheke": {
+                    "count": 299
                 },
                 },
-                "Hirschen": {
-                    "count": 83
+                "Markt-Apotheke": {
+                    "count": 162
                 },
                 },
-                "Hong Kong": {
-                    "count": 81
+                "Аптека": {
+                    "count": 1938
                 },
                 },
-                "Hooters": {
-                    "count": 94
+                "Pharmasave": {
+                    "count": 63
                 },
                 },
-                "IHOP": {
-                    "count": 286
+                "Brunnen-Apotheke": {
+                    "count": 53
                 },
                 },
-                "Kantine": {
-                    "count": 52
+                "Shoppers Drug Mart": {
+                    "count": 417
                 },
                 },
-                "Kelsey's": {
-                    "count": 56
+                "Apotheke am Markt": {
+                    "count": 61
                 },
                 },
-                "Kirchenwirt": {
-                    "count": 79
+                "Alte Apotheke": {
+                    "count": 87
                 },
                 },
-                "Kreuz": {
-                    "count": 75
+                "Neue Apotheke": {
+                    "count": 110
                 },
                 },
-                "Krone": {
-                    "count": 173
+                "Gintarinė vaistinė": {
+                    "count": 101
                 },
                 },
-                "La Cantina": {
-                    "count": 54
+                "Rats-Apotheke": {
+                    "count": 83
                 },
                 },
-                "La Dolce Vita": {
-                    "count": 68
+                "Adler Apotheke": {
+                    "count": 307
                 },
                 },
-                "La Perla": {
-                    "count": 66
+                "Pharmacie Centrale": {
+                    "count": 63
                 },
                 },
-                "La Piazza": {
-                    "count": 67
+                "Walgreens": {
+                    "count": 1521
                 },
                 },
-                "Lamm": {
-                    "count": 67
+                "Rite Aid": {
+                    "count": 700
                 },
                 },
-                "Linde": {
-                    "count": 102
+                "Apotheke": {
+                    "count": 163
                 },
                 },
-                "Lindenhof": {
-                    "count": 82
+                "Linden-Apotheke": {
+                    "count": 209
                 },
                 },
-                "Little Chef": {
-                    "count": 68
+                "Bahnhof-Apotheke": {
+                    "count": 65
                 },
                 },
-                "Longhorn Steakhouse": {
+                "Burg-Apotheke": {
                     "count": 56
                 },
                     "count": 56
                 },
-                "Lotus": {
-                    "count": 64
+                "Jean Coutu": {
+                    "count": 59
                 },
                 },
-                "Löwen": {
-                    "count": 114
+                "Pharmaprix": {
+                    "count": 58
                 },
                 },
-                "Mamma Mia": {
-                    "count": 61
+                "Farmacias Ahumada": {
+                    "count": 102
                 },
                 },
-                "Mandarin": {
-                    "count": 64
+                "Farmacia Comunale": {
+                    "count": 108
                 },
                 },
-                "Mang Inasal": {
-                    "count": 81
+                "Farmacias Cruz Verde": {
+                    "count": 84
                 },
                 },
-                "Mensa": {
-                    "count": 87
+                "Cruz Verde": {
+                    "count": 97
                 },
                 },
-                "Milano": {
+                "Hubertus Apotheke": {
                     "count": 52
                 },
                     "count": 52
                 },
-                "Mykonos": {
-                    "count": 59
+                "CVS": {
+                    "count": 1448
                 },
                 },
-                "Nando's": {
-                    "count": 219
+                "Farmacias SalcoBrand": {
+                    "count": 132
                 },
                 },
-                "Ochsen": {
-                    "count": 93
+                "Фармация": {
+                    "count": 118
                 },
                 },
-                "Olive Garden": {
-                    "count": 241
+                "Bären-Apotheke": {
+                    "count": 72
                 },
                 },
-                "Olympia": {
-                    "count": 78
+                "Clicks": {
+                    "count": 109
                 },
                 },
-                "Outback Steakhouse": {
-                    "count": 189
+                "セイジョー": {
+                    "count": 51
                 },
                 },
-                "Panera Bread": {
-                    "count": 171
+                "マツモトキヨシ": {
+                    "count": 111
                 },
                 },
-                "Panorama": {
-                    "count": 60
+                "Вита": {
+                    "count": 107
                 },
                 },
-                "Peking": {
-                    "count": 54
+                "Радуга": {
+                    "count": 70
                 },
                 },
-                "Perkins": {
-                    "count": 96
+                "サンドラッグ": {
+                    "count": 57
                 },
                 },
-                "Pizza Express": {
-                    "count": 241
+                "Apteka": {
+                    "count": 352
                 },
                 },
-                "Pizza Hut": {
-                    "count": 1038
+                "Первая помощь": {
+                    "count": 74
                 },
                 },
-                "Poseidon": {
+                "Ригла": {
                     "count": 111
                 },
                     "count": 111
                 },
-                "Prezzo": {
+                "Имплозия": {
+                    "count": 63
+                },
+                "Kinney Drugs": {
                     "count": 68
                 },
                     "count": 68
                 },
-                "Ratskeller": {
-                    "count": 148
+                "Классика": {
+                    "count": 66
                 },
                 },
-                "Red Lobster": {
-                    "count": 205
+                "Ljekarna": {
+                    "count": 54
                 },
                 },
-                "Red Robin": {
-                    "count": 169
+                "SalcoBrand": {
+                    "count": 90
                 },
                 },
-                "Rhodos": {
-                    "count": 80
+                "Аптека 36,6": {
+                    "count": 220
                 },
                 },
-                "Roma": {
-                    "count": 60
+                "Фармакор": {
+                    "count": 74
                 },
                 },
-                "Ruby Tuesday": {
-                    "count": 137
+                "スギ薬局": {
+                    "count": 82
                 },
                 },
-                "Rössli": {
-                    "count": 68
+                "Аптечный пункт": {
+                    "count": 140
                 },
                 },
-                "Sakura": {
-                    "count": 69
+                "Невис": {
+                    "count": 58
                 },
                 },
-                "San Marco": {
-                    "count": 66
+                "トモズ (Tomod's)": {
+                    "count": 83
                 },
                 },
-                "Schwarzer Adler": {
-                    "count": 58
+                "Eurovaistinė": {
+                    "count": 62
                 },
                 },
-                "Schützenhaus": {
-                    "count": 129
+                "Farmacity": {
+                    "count": 65
                 },
                 },
-                "Seeblick": {
-                    "count": 51
+                "аптека": {
+                    "count": 100
                 },
                 },
-                "Shanghai": {
-                    "count": 79
+                "The Generics Pharmacy": {
+                    "count": 86
                 },
                 },
-                "Shari's": {
-                    "count": 63
+                "Farmatodo": {
+                    "count": 124
                 },
                 },
-                "Sonne": {
-                    "count": 123
+                "Фармленд": {
+                    "count": 80
                 },
                 },
-                "Sportheim": {
-                    "count": 57
+                "ドラッグてらしま (Drug Terashima)": {
+                    "count": 96
                 },
                 },
-                "Spur": {
-                    "count": 60
+                "ავერსი (Aversi)": {
+                    "count": 62
                 },
                 },
-                "Sternen": {
-                    "count": 78
+                "Farmahorro": {
+                    "count": 58
+                }
+            },
+            "cafe": {
+                "Starbucks": {
+                    "count": 4032,
+                    "tags": {
+                        "cuisine": "coffee_shop"
+                    }
                 },
                 },
-                "Swiss Chalet": {
-                    "count": 101
+                "Cafeteria": {
+                    "count": 77
                 },
                 },
-                "TGI Friday's": {
-                    "count": 138
+                "Costa": {
+                    "count": 579
                 },
                 },
-                "Taj Mahal": {
-                    "count": 101
+                "Caffè Nero": {
+                    "count": 165
                 },
                 },
-                "Texas Roadhouse": {
-                    "count": 96
+                "Кафе": {
+                    "count": 214
                 },
                 },
-                "The Keg": {
-                    "count": 52
+                "Café Central": {
+                    "count": 60
                 },
                 },
-                "Traube": {
+                "Second Cup": {
+                    "count": 190
+                },
+                "Eisdiele": {
                     "count": 65
                 },
                     "count": 65
                 },
-                "Vapiano": {
-                    "count": 81
+                "Dunkin Donuts": {
+                    "count": 393,
+                    "tags": {
+                        "cuisine": "donut"
+                    }
                 },
                 },
-                "Village Inn": {
-                    "count": 88
+                "Segafredo": {
+                    "count": 66
                 },
                 },
-                "Vips": {
-                    "count": 51
+                "Coffee Time": {
+                    "count": 95
                 },
                 },
-                "Waffle House": {
-                    "count": 182
+                "Cafe Coffee Day": {
+                    "count": 104
                 },
                 },
-                "Wagamama": {
-                    "count": 58
+                "Eiscafe Venezia": {
+                    "count": 173
                 },
                 },
-                "Waldschänke": {
-                    "count": 55
+                "スターバックス": {
+                    "count": 248,
+                    "tags": {
+                        "name:en": "Starbucks"
+                    }
                 },
                 },
-                "Zizzi": {
-                    "count": 62
+                "Шоколадница": {
+                    "count": 138
                 },
                 },
-                "Zum Löwen": {
-                    "count": 82
+                "Pret A Manger": {
+                    "count": 115
                 },
                 },
-                "Zur Krone": {
-                    "count": 92
+                "Столовая": {
+                    "count": 351
                 },
                 },
-                "Zur Linde": {
-                    "count": 200
+                "ドトール": {
+                    "count": 163,
+                    "tags": {
+                        "name:en": "DOUTOR"
+                    }
                 },
                 },
-                "Zur Post": {
-                    "count": 117
+                "Tchibo": {
+                    "count": 97
                 },
                 },
-                "Zur Sonne": {
-                    "count": 73
+                "Кофе Хауз": {
+                    "count": 102
                 },
                 },
-                "Евразия": {
+                "Caribou Coffee": {
                     "count": 98
                 },
                     "count": 98
                 },
-                "ЯкиÑ\82оÑ\80иÑ\8f": {
-                    "count": 74
+                "УÑ\8eÑ\82": {
+                    "count": 51
                 },
                 },
-                "ガスト": {
-                    "count": 204,
-                    "tags": {
-                        "name:en": "Gusto"
-                    }
+                "Шашлычная": {
+                    "count": 57
                 },
                 },
-                "サイゼリヤ": {
-                    "count": 81
+                "คาเฟ่ อเมซอน": {
+                    "count": 62
                 },
                 },
-                "ジョナサン": {
-                    "count": 56
+                "Traveler's Coffee": {
+                    "count": 60
                 },
                 },
-                "デニーズ": {
-                    "count": 73
+                "カフェ・ド・クリエ": {
+                    "count": 67,
+                    "tags": {
+                        "name:en": "Cafe de CRIE"
+                    }
                 },
                 },
-                "바다횟집 (Bada Fish Restaurant)": {
-                    "count": 55
+                "Cafe Amazon": {
+                    "count": 54
                 }
             }
         },
         "shop": {
                 }
             }
         },
         "shop": {
-            "alcohol": {
-                "Alko": {
+            "supermarket": {
+                "Budgens": {
+                    "count": 86
+                },
+                "Morrisons": {
+                    "count": 408
+                },
+                "Interspar": {
                     "count": 141
                 },
                     "count": 141
                 },
-                "BWS": {
-                    "count": 58
+                "Merkur": {
+                    "count": 107
                 },
                 },
-                "Bargain Booze": {
-                    "count": 59
+                "Sainsbury's": {
+                    "count": 540
                 },
                 },
-                "Botilleria": {
-                    "count": 75
+                "Lidl": {
+                    "count": 6128
                 },
                 },
-                "Gall & Gall": {
-                    "count": 514
+                "EDEKA": {
+                    "count": 494
                 },
                 },
-                "LCBO": {
-                    "count": 214
+                "Coles": {
+                    "count": 392
                 },
                 },
-                "Nicolas": {
-                    "count": 109
+                "Iceland": {
+                    "count": 301
                 },
                 },
-                "SAQ": {
-                    "count": 66
+                "Coop": {
+                    "count": 1883
                 },
                 },
-                "Systembolaget": {
-                    "count": 199
+                "Tesco": {
+                    "count": 1292
                 },
                 },
-                "The Beer Store": {
-                    "count": 141
+                "Woolworths": {
+                    "count": 530
                 },
                 },
-                "Ароматный мир": {
-                    "count": 56
+                "Zielpunkt": {
+                    "count": 236
                 },
                 },
-                "Живое пиво": {
-                    "count": 62
-                }
-            },
-            "bakery": {
-                "Anker": {
-                    "count": 65
+                "Nahkauf": {
+                    "count": 167
                 },
                 },
-                "Backwerk": {
-                    "count": 94
+                "Billa": {
+                    "count": 1415
                 },
                 },
-                "Boulangerie": {
-                    "count": 232
+                "Kaufland": {
+                    "count": 989
                 },
                 },
-                "Boulangerie Patisserie": {
-                    "count": 76
+                "Plus": {
+                    "count": 125
                 },
                 },
-                "Bäcker": {
-                    "count": 65
+                "ALDI": {
+                    "count": 5132
                 },
                 },
-                "Bäckerei": {
-                    "count": 163
+                "Checkers": {
+                    "count": 126
                 },
                 },
-                "Bäckerei Schmidt": {
-                    "count": 56
+                "Tesco Metro": {
+                    "count": 124
                 },
                 },
-                "Dat Backhus": {
-                    "count": 62
+                "NP": {
+                    "count": 149
                 },
                 },
-                "Der Beck": {
-                    "count": 97
+                "Penny": {
+                    "count": 1758
                 },
                 },
-                "Goeken backen": {
-                    "count": 52
+                "Norma": {
+                    "count": 1062
                 },
                 },
-                "Goldilocks": {
-                    "count": 55
+                "Asda": {
+                    "count": 226
                 },
                 },
-                "Greggs": {
-                    "count": 255
+                "Netto": {
+                    "count": 4331
                 },
                 },
-                "Hofpfisterei": {
-                    "count": 108
+                "REWE": {
+                    "count": 1467
                 },
                 },
-                "Ihle": {
-                    "count": 76
+                "Rewe": {
+                    "count": 1169
                 },
                 },
-                "K&U": {
-                    "count": 54
+                "Aldi Süd": {
+                    "count": 590
                 },
                 },
-                "Kamps": {
-                    "count": 252
+                "Real": {
+                    "count": 248
                 },
                 },
-                "Oebel": {
-                    "count": 57
+                "Tesco Express": {
+                    "count": 388
+                },
+                "King Soopers": {
+                    "count": 70
+                },
+                "Kiwi": {
+                    "count": 164
                 },
                 },
-                "Panaderia": {
-                    "count": 154
+                "Edeka": {
+                    "count": 1799
                 },
                 },
-                "Panificio": {
-                    "count": 63
+                "Pick n Pay": {
+                    "count": 238
                 },
                 },
-                "Paul": {
-                    "count": 74
+                "ICA": {
+                    "count": 192
                 },
                 },
-                "Piekarnia": {
-                    "count": 52
+                "Tengelmann": {
+                    "count": 190
                 },
                 },
-                "Stadtbäckerei": {
-                    "count": 58
+                "Carrefour": {
+                    "count": 1614
                 },
                 },
-                "Stadtbäckerei Junge": {
-                    "count": 53
+                "Waitrose": {
+                    "count": 258
                 },
                 },
-                "Steinecke": {
-                    "count": 135
+                "Spar": {
+                    "count": 2063
                 },
                 },
-                "Thürmann": {
-                    "count": 57
+                "Hofer": {
+                    "count": 439
                 },
                 },
-                "Хлеб": {
-                    "count": 81
-                }
-            },
-            "books": {
-                "Barnes & Noble": {
-                    "count": 239
+                "M-Preis": {
+                    "count": 79
                 },
                 },
-                "Bruna": {
-                    "count": 55
+                "LIDL": {
+                    "count": 915
                 },
                 },
-                "Libro": {
-                    "count": 59
+                "tegut": {
+                    "count": 209
                 },
                 },
-                "Thalia": {
-                    "count": 122
+                "Sainsbury's Local": {
+                    "count": 109
                 },
                 },
-                "Waterstones": {
-                    "count": 85
+                "E-Center": {
+                    "count": 66
                 },
                 },
-                "Weltbild": {
-                    "count": 72
+                "Aldi Nord": {
+                    "count": 197
                 },
                 },
-                "Книги": {
-                    "count": 110
-                }
-            },
-            "car_repair": {
-                "ATU": {
-                    "count": 257
+                "nahkauf": {
+                    "count": 81
                 },
                 },
-                "AutoZone": {
-                    "count": 51
+                "Meijer": {
+                    "count": 73
                 },
                 },
-                "Carglass": {
-                    "count": 99
+                "Safeway": {
+                    "count": 398
                 },
                 },
-                "Euromaster": {
-                    "count": 80
+                "Costco": {
+                    "count": 145
                 },
                 },
-                "Feu Vert": {
-                    "count": 104
+                "Albert": {
+                    "count": 183
                 },
                 },
-                "Firestone": {
-                    "count": 77
+                "Jumbo": {
+                    "count": 190
                 },
                 },
-                "Jiffy Lube": {
-                    "count": 178
+                "Shoprite": {
+                    "count": 239
                 },
                 },
-                "Kwik Fit": {
-                    "count": 73
+                "MPreis": {
+                    "count": 52
                 },
                 },
-                "Midas": {
-                    "count": 171
+                "Penny Market": {
+                    "count": 409
                 },
                 },
-                "Norauto": {
-                    "count": 141
+                "Tesco Extra": {
+                    "count": 119
                 },
                 },
-                "O'Reilly Auto Parts": {
-                    "count": 62
+                "Albert Heijn": {
+                    "count": 464
                 },
                 },
-                "Peugeot": {
-                    "count": 80
+                "IGA": {
+                    "count": 347
                 },
                 },
-                "Pit Stop": {
-                    "count": 55
+                "Super U": {
+                    "count": 476
                 },
                 },
-                "Renault": {
-                    "count": 158
+                "Metro": {
+                    "count": 256
                 },
                 },
-                "Roady": {
-                    "count": 52
+                "Neukauf": {
+                    "count": 77
                 },
                 },
-                "Speedy": {
-                    "count": 104
+                "Migros": {
+                    "count": 442
                 },
                 },
-                "ÖAMTC": {
-                    "count": 51
+                "Marktkauf": {
+                    "count": 126
                 },
                 },
-                "Автозапчасти": {
-                    "count": 172
+                "Delikatesy Centrum": {
+                    "count": 57
                 },
                 },
-                "Автосервис": {
+                "C1000": {
                     "count": 314
                 },
                     "count": 314
                 },
-                "СТО": {
-                    "count": 338
-                },
-                "Шиномонтаж": {
-                    "count": 995
-                }
-            },
-            "car": {
-                "Audi": {
-                    "count": 101
+                "Hoogvliet": {
+                    "count": 52
                 },
                 },
-                "BMW": {
-                    "count": 139
+                "COOP": {
+                    "count": 192
                 },
                 },
-                "Chevrolet": {
-                    "count": 75
+                "Food Basics": {
+                    "count": 74
                 },
                 },
-                "Citroen": {
+                "Casino": {
                     "count": 259
                 },
                     "count": 259
                 },
-                "Fiat": {
-                    "count": 83
+                "Penny Markt": {
+                    "count": 462
                 },
                 },
-                "Ford": {
-                    "count": 216
+                "Giant": {
+                    "count": 194
                 },
                 },
-                "Honda": {
-                    "count": 134
+                "COOP Jednota": {
+                    "count": 69
                 },
                 },
-                "Hyundai": {
-                    "count": 146
+                "Rema 1000": {
+                    "count": 364
                 },
                 },
-                "Mazda": {
+                "Kaufpark": {
                     "count": 96
                 },
                     "count": 96
                 },
-                "Mercedes-Benz": {
-                    "count": 218
-                },
-                "Mitsubishi": {
-                    "count": 66
-                },
-                "Nissan": {
-                    "count": 173
+                "ALDI SÜD": {
+                    "count": 114
                 },
                 },
-                "Opel": {
-                    "count": 161
+                "Simply Market": {
+                    "count": 320
                 },
                 },
-                "Peugeot": {
-                    "count": 291
+                "Konzum": {
+                    "count": 228
                 },
                 },
-                "Renault": {
-                    "count": 356
+                "Carrefour Express": {
+                    "count": 330
                 },
                 },
-                "Skoda": {
-                    "count": 92
+                "Eurospar": {
+                    "count": 265
                 },
                 },
-                "Suzuki": {
-                    "count": 73
+                "Mercator": {
+                    "count": 123
                 },
                 },
-                "Toyota": {
-                    "count": 238
+                "Mercadona": {
+                    "count": 734
                 },
                 },
-                "Volkswagen": {
-                    "count": 200
+                "Famila": {
+                    "count": 129
                 },
                 },
-                "Volvo": {
-                    "count": 82
+                "Hemköp": {
+                    "count": 83
                 },
                 },
-                "Автозапчасти": {
-                    "count": 290
+                "real,-": {
+                    "count": 80
                 },
                 },
-                "Автомагазин": {
-                    "count": 64
+                "Markant": {
+                    "count": 87
                 },
                 },
-                "Шиномонтаж": {
-                    "count": 263
-                }
-            },
-            "chemist": {
-                "Bipa": {
-                    "count": 276
+                "Volg": {
+                    "count": 128
                 },
                 },
-                "dm": {
-                    "count": 873
+                "Leader Price": {
+                    "count": 257
                 },
                 },
-                "Douglas": {
-                    "count": 62
+                "Treff 3000": {
+                    "count": 95
                 },
                 },
-                "Etos": {
-                    "count": 465
+                "SuperBrugsen": {
+                    "count": 67
                 },
                 },
-                "Ihr Platz": {
-                    "count": 76
+                "Kaiser's": {
+                    "count": 253
                 },
                 },
-                "Kruidvat": {
-                    "count": 114
+                "K+K": {
+                    "count": 104
                 },
                 },
-                "Müller": {
-                    "count": 195
+                "Unimarkt": {
+                    "count": 81
                 },
                 },
-                "Rossmann": {
-                    "count": 1623
+                "Sobeys": {
+                    "count": 120
                 },
                 },
-                "Schlecker": {
-                    "count": 201
-                }
-            },
-            "clothes": {
-                "AWG": {
-                    "count": 62
+                "S-Market": {
+                    "count": 107
                 },
                 },
-                "Ackermans": {
-                    "count": 91
+                "Combi": {
+                    "count": 55
                 },
                 },
-                "Adidas": {
-                    "count": 81
+                "Denner": {
+                    "count": 267
                 },
                 },
-                "Adler": {
-                    "count": 53
+                "Konsum": {
+                    "count": 134
                 },
                 },
-                "American Apparel": {
-                    "count": 53
+                "Franprix": {
+                    "count": 308
                 },
                 },
-                "Benetton": {
-                    "count": 96
+                "Monoprix": {
+                    "count": 195
                 },
                 },
-                "Bonita": {
-                    "count": 143
+                "Diska": {
+                    "count": 68
                 },
                 },
-                "C&A": {
-                    "count": 484
+                "PENNY": {
+                    "count": 79
                 },
                 },
-                "Calzedonia": {
-                    "count": 56
+                "Dia": {
+                    "count": 798
                 },
                 },
-                "Cecil": {
-                    "count": 51
+                "Giant Eagle": {
+                    "count": 82
                 },
                 },
-                "Celio": {
-                    "count": 71
+                "NORMA": {
+                    "count": 115
                 },
                 },
-                "Charles Vögele": {
-                    "count": 63
+                "AD Delhaize": {
+                    "count": 62
                 },
                 },
-                "Deichmann": {
-                    "count": 61
+                "Auchan": {
+                    "count": 147
                 },
                 },
-                "Dorothy Perkins": {
-                    "count": 51
+                "Consum": {
+                    "count": 125
                 },
                 },
-                "Edgars": {
-                    "count": 111
+                "Carrefour Market": {
+                    "count": 80
                 },
                 },
-                "Ernsting's family": {
-                    "count": 286
+                "Carrefour City": {
+                    "count": 117
                 },
                 },
-                "Esprit": {
-                    "count": 209
+                "Pam": {
+                    "count": 54
                 },
                 },
-                "Etam": {
-                    "count": 51
+                "Despar": {
+                    "count": 147
                 },
                 },
-                "Gap": {
-                    "count": 74
+                "Eroski": {
+                    "count": 204
                 },
                 },
-                "Gerry Weber": {
-                    "count": 68
+                "Costcutter": {
+                    "count": 61
                 },
                 },
-                "H&M": {
-                    "count": 607
+                "Maxi": {
+                    "count": 103
                 },
                 },
-                "Jack & Jones": {
-                    "count": 51
+                "Colruyt": {
+                    "count": 181
                 },
                 },
-                "Jack Wolfskin": {
-                    "count": 55
+                "The Co-operative": {
+                    "count": 64
                 },
                 },
-                "Jet": {
-                    "count": 62
+                "sky": {
+                    "count": 101
                 },
                 },
-                "Jules": {
-                    "count": 61
+                "Intermarché": {
+                    "count": 1183
                 },
                 },
-                "KiK": {
-                    "count": 1148
+                "Delhaize": {
+                    "count": 207
                 },
                 },
-                "Kiabi": {
-                    "count": 139
+                "CBA": {
+                    "count": 165
                 },
                 },
-                "Lacoste": {
-                    "count": 66
+                "Shopi": {
+                    "count": 57
                 },
                 },
-                "Levi's": {
-                    "count": 58
+                "Walmart": {
+                    "count": 611
                 },
                 },
-                "Lindex": {
-                    "count": 70
+                "Kroger": {
+                    "count": 298
                 },
                 },
-                "Mango": {
-                    "count": 115
+                "Albertsons": {
+                    "count": 236
                 },
                 },
-                "Matalan": {
-                    "count": 83
+                "Trader Joe's": {
+                    "count": 190
                 },
                 },
-                "Mexx": {
-                    "count": 65
+                "Feneberg": {
+                    "count": 58
                 },
                 },
-                "Mr Price": {
-                    "count": 86
+                "dm": {
+                    "count": 108
                 },
                 },
-                "NKD": {
-                    "count": 444
+                "Kvickly": {
+                    "count": 54
                 },
                 },
-                "New Look": {
-                    "count": 115
+                "Makro": {
+                    "count": 137
                 },
                 },
-                "New Yorker": {
-                    "count": 173
+                "Nah & Frisch": {
+                    "count": 72
                 },
                 },
-                "Next": {
-                    "count": 163
+                "Champion": {
+                    "count": 59
                 },
                 },
-                "Old Navy": {
-                    "count": 154
+                "Fakta": {
+                    "count": 227
                 },
                 },
-                "Orsay": {
-                    "count": 71
+                "Магнит": {
+                    "count": 1697
                 },
                 },
-                "Peacocks": {
-                    "count": 86
+                "Caprabo": {
+                    "count": 101
                 },
                 },
-                "Pep": {
-                    "count": 136
+                "Famiglia Cooperativa": {
+                    "count": 64
                 },
                 },
-                "Pimkie": {
-                    "count": 72
+                "Народная 7Я семьЯ": {
+                    "count": 150
                 },
                 },
-                "Primark": {
+                "Esselunga": {
                     "count": 87
                 },
                     "count": 87
                 },
-                "Promod": {
-                    "count": 71
+                "Maxima": {
+                    "count": 103
                 },
                 },
-                "River Island": {
-                    "count": 56
+                "Petit Casino": {
+                    "count": 104
                 },
                 },
-                "Ross": {
-                    "count": 77
+                "Wasgau": {
+                    "count": 60
                 },
                 },
-                "Street One": {
-                    "count": 74
+                "Pingo Doce": {
+                    "count": 250
                 },
                 },
-                "TK Maxx": {
-                    "count": 73
+                "Match": {
+                    "count": 142
                 },
                 },
-                "Takko": {
-                    "count": 476
+                "Profi": {
+                    "count": 58
                 },
                 },
-                "Tally Weijl": {
-                    "count": 67
+                "Lider": {
+                    "count": 64
                 },
                 },
-                "Tommy Hilfiger": {
-                    "count": 65
+                "Unimarc": {
+                    "count": 174
                 },
                 },
-                "Truworths": {
-                    "count": 64
+                "Co-operative Food": {
+                    "count": 51
                 },
                 },
-                "Ulla Popken": {
-                    "count": 59
+                "Santa Isabel": {
+                    "count": 128
                 },
                 },
-                "United Colors of Benetton": {
-                    "count": 90
+                "Седьмой континент": {
+                    "count": 79
                 },
                 },
-                "Urban Outfitters": {
+                "HIT": {
                     "count": 61
                 },
                     "count": 61
                 },
-                "Vero Moda": {
-                    "count": 89
-                },
-                "Vögele": {
-                    "count": 129
+                "Rimi": {
+                    "count": 104
                 },
                 },
-                "Winners": {
-                    "count": 59
+                "Conad": {
+                    "count": 302
                 },
                 },
-                "Woolworths": {
-                    "count": 116
+                "Фуршет": {
+                    "count": 74
                 },
                 },
-                "Zara": {
-                    "count": 199
+                "Willys": {
+                    "count": 55
                 },
                 },
-                "Zeeman": {
-                    "count": 108
+                "Farmfoods": {
+                    "count": 62
                 },
                 },
-                "s.Oliver": {
-                    "count": 53
+                "Фора": {
+                    "count": 52
                 },
                 },
-                "Одежда": {
-                    "count": 68
+                "Dunnes Stores": {
+                    "count": 72
                 },
                 },
-                "洋服の青山": {
-                    "count": 86
-                }
-            },
-            "computer": {
-                "DNS": {
+                "Сільпо": {
                     "count": 119
                 },
                     "count": 119
                 },
-                "PC World": {
-                    "count": 58
-                }
-            },
-            "convenience": {
-                "24 часа": {
-                    "count": 56
+                "マルエツ": {
+                    "count": 59
                 },
                 },
-                "7-Eleven": {
-                    "count": 3898
+                "Piggly Wiggly": {
+                    "count": 52
                 },
                 },
-                "8 à Huit": {
-                    "count": 57
+                "Crai": {
+                    "count": 52
                 },
                 },
-                "ABC": {
-                    "count": 138
+                "Biedronka": {
+                    "count": 1290
                 },
                 },
-                "Alepa": {
-                    "count": 63
+                "El Árbol": {
+                    "count": 72
                 },
                 },
-                "Alfamart": {
-                    "count": 74
+                "Centre Commercial E. Leclerc": {
+                    "count": 553
                 },
                 },
-                "Almacen": {
-                    "count": 201
+                "Foodland": {
+                    "count": 98
                 },
                 },
-                "BP": {
-                    "count": 157
+                "Super Brugsen": {
+                    "count": 64
                 },
                 },
-                "Biedronka": {
-                    "count": 67
+                "Дикси": {
+                    "count": 610
                 },
                 },
-                "Boutique": {
-                    "count": 59
+                "Пятёрочка": {
+                    "count": 1293
                 },
                 },
-                "CBA": {
-                    "count": 122
+                "Publix": {
+                    "count": 321
                 },
                 },
-                "COOP": {
-                    "count": 122
+                "Whole Foods": {
+                    "count": 196
                 },
                 },
-                "COOP Jednota": {
-                    "count": 160
+                "Føtex": {
+                    "count": 66
                 },
                 },
-                "Carrefour City": {
-                    "count": 54
+                "coop": {
+                    "count": 74
                 },
                 },
-                "Carrefour Express": {
-                    "count": 73
+                "Fressnapf": {
+                    "count": 64
                 },
                 },
-                "Casey's General Store": {
-                    "count": 80
+                "Coop Konsum": {
+                    "count": 79
                 },
                 },
-                "Casino": {
-                    "count": 85
+                "Carrefour Contact": {
+                    "count": 77
                 },
                 },
-                "Centra": {
-                    "count": 112
+                "SPAR": {
+                    "count": 280
                 },
                 },
-                "Central Convenience Store": {
-                    "count": 52
+                "No Frills": {
+                    "count": 102
                 },
                 },
-                "Chevron": {
-                    "count": 57
+                "The Co-operative Food": {
+                    "count": 120
                 },
                 },
-                "Circle K": {
-                    "count": 269
+                "Plodine": {
+                    "count": 51
                 },
                 },
-                "Citgo": {
+                "ADEG": {
                     "count": 63
                 },
                     "count": 63
                 },
-                "Coop": {
-                    "count": 505
+                "Minipreço": {
+                    "count": 103
                 },
                 },
-                "Coop Jednota": {
+                "Eurospin": {
+                    "count": 153
+                },
+                "Семья": {
+                    "count": 62
+                },
+                "Евроопт": {
                     "count": 58
                 },
                     "count": 58
                 },
-                "Costcutter": {
-                    "count": 272
+                "Centra": {
+                    "count": 51
                 },
                 },
-                "Cumberland Farms": {
-                    "count": 62
+                "Квартал": {
+                    "count": 88
                 },
                 },
-                "Delikatesy": {
-                    "count": 77
+                "New World": {
+                    "count": 65
                 },
                 },
-                "Dollar General": {
-                    "count": 101
+                "Countdown": {
+                    "count": 92
                 },
                 },
-                "Dorfladen": {
-                    "count": 76
+                "Reliance Fresh": {
+                    "count": 62
                 },
                 },
-                "Epicerie": {
-                    "count": 64
+                "Stokrotka": {
+                    "count": 98
                 },
                 },
-                "Esso": {
-                    "count": 64
+                "Coop Jednota": {
+                    "count": 73
                 },
                 },
-                "FamilyMart": {
-                    "count": 489
+                "Fred Meyer": {
+                    "count": 62
                 },
                 },
-                "Food Mart": {
-                    "count": 88
+                "Irma": {
+                    "count": 59
                 },
                 },
-                "Four Square": {
-                    "count": 51
+                "Continente": {
+                    "count": 73
                 },
                 },
-                "Franprix": {
-                    "count": 64
+                "Price Chopper": {
+                    "count": 98
                 },
                 },
-                "Groszek": {
-                    "count": 57
+                "Wegmans": {
+                    "count": 53
                 },
                 },
-                "Hasty Market": {
+                "Game": {
                     "count": 53
                 },
                     "count": 53
                 },
-                "Indomaret": {
-                    "count": 126
+                "Soriana": {
+                    "count": 92
                 },
                 },
-                "Jednota": {
-                    "count": 56
+                "Alimerka": {
+                    "count": 61
                 },
                 },
-                "K-Market": {
-                    "count": 57
+                "Piotr i Paweł": {
+                    "count": 52
                 },
                 },
-                "Kiosk": {
-                    "count": 57
+                "Перекресток": {
+                    "count": 309
                 },
                 },
-                "Konzum": {
-                    "count": 164
+                "Maxima X": {
+                    "count": 113
                 },
                 },
-                "Kum & Go": {
+                "Карусель": {
                     "count": 55
                 },
                     "count": 55
                 },
-                "Kwik Trip": {
+                "Tesco Lotus": {
                     "count": 69
                 },
                     "count": 69
                 },
-                "LAWSON": {
-                    "count": 397
+                "Condis": {
+                    "count": 64
                 },
                 },
-                "Lewiatan": {
-                    "count": 111
+                "Sam's Club": {
+                    "count": 131
                 },
                 },
-                "Londis": {
-                    "count": 341
+                "Копейка": {
+                    "count": 91
                 },
                 },
-                "Mac's": {
-                    "count": 147
+                "Géant Casino": {
+                    "count": 54
                 },
                 },
-                "Mace": {
+                "ASDA": {
+                    "count": 177
+                },
+                "Intermarche": {
                     "count": 111
                 },
                     "count": 111
                 },
-                "McColl's": {
-                    "count": 97
+                "Stop & Shop": {
+                    "count": 56
                 },
                 },
-                "Mercator": {
-                    "count": 59
+                "Food Lion": {
+                    "count": 192
                 },
                 },
-                "Mini Market": {
-                    "count": 190
+                "Harris Teeter": {
+                    "count": 88
                 },
                 },
-                "Mini Stop": {
-                    "count": 210
+                "H-E-B": {
+                    "count": 122
                 },
                 },
-                "Mobil": {
-                    "count": 63
+                "Foodworks": {
+                    "count": 59
                 },
                 },
-                "Nisa": {
-                    "count": 52
+                "Polo Market": {
+                    "count": 84
                 },
                 },
-                "Nisa Local": {
-                    "count": 71
+                "西友 (SEIYU)": {
+                    "count": 58
                 },
                 },
-                "Oxxo": {
-                    "count": 614
+                "Полушка": {
+                    "count": 135
                 },
                 },
-                "One Stop": {
-                    "count": 142
+                "Extra": {
+                    "count": 76
                 },
                 },
-                "Petit Casino": {
-                    "count": 227
+                "Lewiatan": {
+                    "count": 91
                 },
                 },
-                "Picard": {
-                    "count": 53
+                "АТБ": {
+                    "count": 305
                 },
                 },
-                "Potraviny": {
-                    "count": 243
+                "Społem": {
+                    "count": 55
                 },
                 },
-                "Premier": {
-                    "count": 123
+                "Bodega Aurrera": {
+                    "count": 78
                 },
                 },
-                "Proxi": {
-                    "count": 114
+                "Мария-Ра": {
+                    "count": 95
                 },
                 },
-                "QuikTrip": {
-                    "count": 59
+                "Магнолия": {
+                    "count": 71
                 },
                 },
-                "SPAR": {
-                    "count": 185
+                "Магазин": {
+                    "count": 113
                 },
                 },
-                "Sainsbury's Local": {
-                    "count": 96
+                "Монетка": {
+                    "count": 170
                 },
                 },
-                "Sale": {
-                    "count": 80
+                "Hy-Vee": {
+                    "count": 72
                 },
                 },
-                "Select": {
-                    "count": 58
+                "Walmart Supercenter": {
+                    "count": 112
                 },
                 },
-                "Shell": {
-                    "count": 241
+                "Hannaford": {
+                    "count": 55
                 },
                 },
-                "Siwa": {
-                    "count": 212
+                "業務スーパー": {
+                    "count": 55
                 },
                 },
-                "Sklep spożywczy": {
-                    "count": 235
+                "Norfa XL": {
+                    "count": 53
                 },
                 },
-                "Spar": {
-                    "count": 888
+                "ヨークマート (YorkMart)": {
+                    "count": 64
                 },
                 },
-                "Społem": {
-                    "count": 84
+                "Leclerc Drive": {
+                    "count": 75
+                }
+            },
+            "electronics": {
+                "Media Markt": {
+                    "count": 277
                 },
                 },
-                "Spożywczy": {
-                    "count": 67
+                "Maplin": {
+                    "count": 63
                 },
                 },
-                "Statoil": {
+                "Best Buy": {
+                    "count": 325
+                },
+                "Future Shop": {
                     "count": 69
                 },
                     "count": 69
                 },
-                "Stewart's": {
-                    "count": 254
+                "Saturn": {
+                    "count": 130
                 },
                 },
-                "Stores": {
-                    "count": 61
+                "Currys": {
+                    "count": 81
                 },
                 },
-                "Studenac": {
-                    "count": 74
+                "Radio Shack": {
+                    "count": 249
                 },
                 },
-                "Sunkus": {
-                    "count": 63
+                "Comet": {
+                    "count": 52
                 },
                 },
-                "Tchibo": {
-                    "count": 54
+                "Euronics": {
+                    "count": 112
                 },
                 },
-                "Tesco": {
-                    "count": 55
+                "Expert": {
+                    "count": 119
+                },
+                "Эльдорадо": {
+                    "count": 180
+                },
+                "Darty": {
+                    "count": 72
+                },
+                "М.Видео": {
+                    "count": 75
+                }
+            },
+            "convenience": {
+                "Shell": {
+                    "count": 251
+                },
+                "Spar": {
+                    "count": 913
+                },
+                "McColl's": {
+                    "count": 96
                 },
                 "Tesco Express": {
                 },
                 "Tesco Express": {
-                    "count": 415
+                    "count": 417
+                },
+                "Sainsbury's Local": {
+                    "count": 98
+                },
+                "One Stop": {
+                    "count": 143
                 },
                 "The Co-operative Food": {
                     "count": 109
                 },
                 },
                 "The Co-operative Food": {
                     "count": 109
                 },
-                "Valintatalo": {
-                    "count": 62
+                "Londis": {
+                    "count": 349
                 },
                 },
-                "Vival": {
-                    "count": 182
+                "7-Eleven": {
+                    "count": 4138
                 },
                 },
-                "Volg": {
-                    "count": 110
+                "CBA": {
+                    "count": 128
                 },
                 },
-                "Wawa": {
-                    "count": 129
+                "Sale": {
+                    "count": 79
                 },
                 },
-                "abc": {
-                    "count": 61
+                "Statoil": {
+                    "count": 69
                 },
                 },
-                "Żabka": {
-                    "count": 497
+                "Konzum": {
+                    "count": 171
                 },
                 },
-                "Авоська": {
-                    "count": 53
+                "Siwa": {
+                    "count": 211
                 },
                 },
-                "Березка": {
-                    "count": 71
+                "Mercator": {
+                    "count": 58
                 },
                 },
-                "Весна": {
-                    "count": 56
+                "Esso": {
+                    "count": 66
                 },
                 },
-                "Визит": {
+                "COOP Jednota": {
+                    "count": 172
+                },
+                "Mac's": {
+                    "count": 151
+                },
+                "Alepa": {
+                    "count": 62
+                },
+                "Hasty Market": {
+                    "count": 54
+                },
+                "K-Market": {
                     "count": 55
                 },
                     "count": 55
                 },
-                "Виктория": {
-                    "count": 67
+                "Coop": {
+                    "count": 520
                 },
                 },
-                "Гастроном": {
-                    "count": 136
+                "Costcutter": {
+                    "count": 285
                 },
                 },
-                "Дикси": {
-                    "count": 118
+                "Valintatalo": {
+                    "count": 61
                 },
                 },
-                "Кировский": {
-                    "count": 69
+                "SPAR": {
+                    "count": 188
                 },
                 },
-                "Копеечка": {
-                    "count": 56
+                "COOP": {
+                    "count": 134
                 },
                 },
-                "Кулинария": {
-                    "count": 53
+                "Casino": {
+                    "count": 87
                 },
                 },
-                "Магазин": {
-                    "count": 760
+                "Franprix": {
+                    "count": 62
                 },
                 },
-                "Магнит": {
-                    "count": 645
+                "Circle K": {
+                    "count": 277
                 },
                 },
-                "Мария-Ра": {
-                    "count": 76
+                "セブンイレブン": {
+                    "count": 2893,
+                    "tags": {
+                        "name:en": "7-Eleven"
+                    }
                 },
                 },
-                "Мечта": {
-                    "count": 53
+                "ローソン": {
+                    "count": 1514,
+                    "tags": {
+                        "name:en": "LAWSON"
+                    }
                 },
                 },
-                "Минимаркет": {
-                    "count": 97
+                "BP": {
+                    "count": 160
                 },
                 },
-                "Монетка": {
-                    "count": 59
+                "Tesco": {
+                    "count": 55
                 },
                 },
-                "Надежда": {
-                    "count": 54
+                "Petit Casino": {
+                    "count": 231
                 },
                 },
-                "Перекресток": {
-                    "count": 51
+                "Volg": {
+                    "count": 113
                 },
                 },
-                "Продукти": {
-                    "count": 153
+                "Mace": {
+                    "count": 112
                 },
                 },
-                "Продуктовый": {
-                    "count": 65
+                "Mini Market": {
+                    "count": 223
                 },
                 },
-                "Продуктовый магазин": {
-                    "count": 87
+                "Nisa Local": {
+                    "count": 74
+                },
+                "Dorfladen": {
+                    "count": 74
                 },
                 "Продукты": {
                 },
                 "Продукты": {
-                    "count": 3813
+                    "count": 4085
                 },
                 },
-                "Пятёрочка": {
-                    "count": 377
+                "Mini Stop": {
+                    "count": 222
                 },
                 },
-                "Радуга": {
-                    "count": 80
+                "LAWSON": {
+                    "count": 414
                 },
                 },
-                "Смак": {
-                    "count": 70
+                "デイリーヤマザキ": {
+                    "count": 134
                 },
                 },
-                "ТеÑ\80емок": {
-                    "count": 53
+                "Ð\9dадежда": {
+                    "count": 56
                 },
                 },
-                "Универсам": {
-                    "count": 75
+                "Mobil": {
+                    "count": 64
                 },
                 },
-                "магазин": {
-                    "count": 102
+                "Nisa": {
+                    "count": 51
                 },
                 },
-                "продукты": {
-                    "count": 113
+                "Premier": {
+                    "count": 126
                 },
                 },
-                "เซเว่นอีเลฟเว่น": {
-                    "count": 193
+                "ABC": {
+                    "count": 147
                 },
                 },
-                "მარკეტი (Market)": {
-                    "count": 145
+                "Edeka": {
+                    "count": 51
                 },
                 },
-                "ã\82µã\83³ã\82¯ã\82¹": {
-                    "count": 517,
+                "ã\83\9fã\83\8bã\82¹ã\83\88ã\83\83ã\83\97": {
+                    "count": 299,
                     "tags": {
                     "tags": {
-                        "name:en": "sunkus"
+                        "name:en": "MINISTOP"
                     }
                 },
                     }
                 },
-                "ã\82µã\83¼ã\82¯ã\83«K": {
-                    "count": 450,
+                "ã\82µã\83³ã\82¯ã\82¹": {
+                    "count": 537,
                     "tags": {
                     "tags": {
-                        "name:en": "Circle K"
+                        "name:en": "sunkus"
                     }
                 },
                 "スリーエフ": {
                     }
                 },
                 "スリーエフ": {
-                    "count": 84
+                    "count": 87
                 },
                 },
-                "セイコーマート (Seicomart)": {
-                    "count": 52
+                "8 à Huit": {
+                    "count": 59
                 },
                 },
-                "セブンイレブン": {
-                    "count": 2742,
-                    "tags": {
-                        "name:en": "7-Eleven"
-                    }
+                "Tchibo": {
+                    "count": 55
                 },
                 },
-                "デイリーヤマザキ": {
-                    "count": 124
+                "Żabka": {
+                    "count": 520
+                },
+                "Almacen": {
+                    "count": 211
+                },
+                "Vival": {
+                    "count": 191
+                },
+                "FamilyMart": {
+                    "count": 518
                 },
                 "ファミリーマート": {
                 },
                 "ファミリーマート": {
-                    "count": 1352,
+                    "count": 1512,
                     "tags": {
                         "name:en": "FamilyMart"
                     }
                 },
                     "tags": {
                         "name:en": "FamilyMart"
                     }
                 },
-                "ミニストップ": {
-                    "count": 282,
-                    "tags": {
-                        "name:en": "MINISTOP"
-                    }
+                "Carrefour City": {
+                    "count": 54
                 },
                 },
-                "ローソン": {
-                    "count": 1399,
-                    "tags": {
-                        "name:en": "LAWSON"
-                    }
+                "Sunkus": {
+                    "count": 61
                 },
                 },
-                "ローソンストア100": {
-                    "count": 65
+                "Casey's General Store": {
+                    "count": 88
                 },
                 },
-                "ã\83­ã\83¼ã\82½ã\83³ã\82¹ã\83\88ã\82¢100 (LAWSON STORE 100)": {
-                    "count": 84
+                "ã\82»ã\83\96ã\83³ã\82¤ã\83¬ã\83\96ã\83³(Seven-Eleven)": {
+                    "count": 58
                 },
                 },
-                "全家": {
-                    "count": 60
+                "Jednota": {
+                    "count": 55
+                },
+                "Гастроном": {
+                    "count": 148
                 },
                 },
-                "全家便利商店": {
-                    "count": 104
-                }
-            },
-            "department_store": {
-                "Big W": {
-                    "count": 51
+                "Sklep spożywczy": {
+                    "count": 276
                 },
                 },
-                "Canadian Tire": {
-                    "count": 69
+                "Centra": {
+                    "count": 110
                 },
                 },
-                "Debenhams": {
-                    "count": 65
+                "Магнит": {
+                    "count": 684
                 },
                 },
-                "Galeria Kaufhof": {
-                    "count": 57
+                "サークルK": {
+                    "count": 495,
+                    "tags": {
+                        "name:en": "Circle K"
+                    }
                 },
                 },
-                "Karstadt": {
-                    "count": 62
+                "Wawa": {
+                    "count": 130
                 },
                 },
-                "Kmart": {
+                "Proxi": {
                     "count": 120
                 },
                     "count": 120
                 },
-                "Kohl's": {
-                    "count": 123
-                },
-                "Macy's": {
-                    "count": 119
+                "Универсам": {
+                    "count": 79
                 },
                 },
-                "Marks & Spencer": {
+                "Groszek": {
                     "count": 59
                 },
                     "count": 59
                 },
-                "Sears": {
-                    "count": 208
+                "Select": {
+                    "count": 58
                 },
                 },
-                "Target": {
-                    "count": 468
+                "Potraviny": {
+                    "count": 246
                 },
                 },
-                "Walmart": {
-                    "count": 456
+                "Смак": {
+                    "count": 72
                 },
                 },
-                "Walmart Supercenter": {
-                    "count": 67
+                "Эконом": {
+                    "count": 53
                 },
                 },
-                "Woolworth": {
-                    "count": 74
+                "Магазин": {
+                    "count": 875
                 },
                 },
-                "Универмаг": {
-                    "count": 57
-                }
-            },
-            "doityourself": {
-                "Ace Hardware": {
-                    "count": 130
+                "Березка": {
+                    "count": 75
                 },
                 },
-                "B&Q": {
-                    "count": 222
+                "Społem": {
+                    "count": 89
                 },
                 },
-                "Bauhaus": {
-                    "count": 178
+                "Carrefour Express": {
+                    "count": 81
                 },
                 },
-                "Baumax": {
-                    "count": 94
+                "Biedronka": {
+                    "count": 77
                 },
                 },
-                "Brico": {
-                    "count": 99
+                "Cumberland Farms": {
+                    "count": 63
                 },
                 },
-                "Bricomarché": {
-                    "count": 213
+                "Chevron": {
+                    "count": 56
                 },
                 },
-                "Bricorama": {
-                    "count": 59
+                "Coop Jednota": {
+                    "count": 63
                 },
                 },
-                "Bunnings Warehouse": {
-                    "count": 87
+                "Tesco Lotus Express": {
+                    "count": 64
                 },
                 },
-                "Canadian Tire": {
-                    "count": 92
+                "Kiosk": {
+                    "count": 55
                 },
                 },
-                "Castorama": {
-                    "count": 160
+                "24 часа": {
+                    "count": 58
                 },
                 },
-                "Gamma": {
-                    "count": 105
+                "Минимаркет": {
+                    "count": 97
                 },
                 },
-                "Hagebau": {
-                    "count": 61
+                "Oxxo": {
+                    "count": 632
                 },
                 },
-                "Hagebaumarkt": {
-                    "count": 109
+                "Пятёрочка": {
+                    "count": 383
                 },
                 },
-                "Hellweg": {
-                    "count": 62
+                "abc": {
+                    "count": 64
                 },
                 },
-                "Home Depot": {
-                    "count": 789
+                "Stewart's": {
+                    "count": 255
                 },
                 },
-                "Home Hardware": {
-                    "count": 66
+                "Продукти": {
+                    "count": 162
                 },
                 },
-                "Homebase": {
-                    "count": 224
+                "ローソンストア100 (LAWSON STORE 100)": {
+                    "count": 84
                 },
                 },
-                "Hornbach": {
-                    "count": 124
+                "Дикси": {
+                    "count": 121
                 },
                 },
-                "Hubo": {
-                    "count": 72
+                "Радуга": {
+                    "count": 85
                 },
                 },
-                "Lagerhaus": {
+                "ローソンストア100": {
                     "count": 71
                 },
                     "count": 71
                 },
-                "Leroy Merlin": {
-                    "count": 197
+                "เซเว่นอีเลฟเว่น": {
+                    "count": 191
                 },
                 },
-                "Lowes": {
-                    "count": 1131
+                "Spożywczy": {
+                    "count": 75
                 },
                 },
-                "Max Bahr": {
-                    "count": 86
+                "Delikatesy Centrum": {
+                    "count": 51
                 },
                 },
-                "Menards": {
-                    "count": 62
+                "Citgo": {
+                    "count": 63
                 },
                 },
-                "Mr Bricolage": {
-                    "count": 87
+                "Фортуна": {
+                    "count": 52
                 },
                 },
-                "OBI": {
-                    "count": 418
+                "Kum & Go": {
+                    "count": 59
                 },
                 },
-                "Praktiker": {
-                    "count": 187
+                "Мария-Ра": {
+                    "count": 75
                 },
                 },
-                "Rona": {
+                "Picard": {
+                    "count": 55
+                },
+                "Four Square": {
+                    "count": 51
+                },
+                "Визит": {
                     "count": 57
                 },
                     "count": 57
                 },
-                "Toom": {
-                    "count": 69
+                "Авоська": {
+                    "count": 52
                 },
                 },
-                "Toom Baumarkt": {
-                    "count": 65
+                "Dollar General": {
+                    "count": 109
                 },
                 },
-                "Weldom": {
-                    "count": 70
+                "Studenac": {
+                    "count": 75
                 },
                 },
-                "Wickes": {
-                    "count": 120
+                "Central Convenience Store": {
+                    "count": 54
                 },
                 },
-                "СÑ\82Ñ\80оймаÑ\82еÑ\80иалÑ\8b": {
-                    "count": 165
+                "Ð\9cонеÑ\82ка": {
+                    "count": 61
                 },
                 },
-                "Хозтовары": {
-                    "count": 68
-                }
-            },
-            "electronics": {
-                "Best Buy": {
-                    "count": 297
+                "продукты": {
+                    "count": 118
                 },
                 },
-                "Comet": {
-                    "count": 62
+                "Теремок": {
+                    "count": 54
                 },
                 },
-                "Currys": {
-                    "count": 80
+                "Kwik Trip": {
+                    "count": 68
                 },
                 },
-                "Darty": {
-                    "count": 71
+                "Кулинария": {
+                    "count": 53
                 },
                 },
-                "Euronics": {
-                    "count": 109
+                "全家": {
+                    "count": 71
                 },
                 },
-                "Expert": {
-                    "count": 117
+                "Мечта": {
+                    "count": 54
                 },
                 },
-                "Future Shop": {
-                    "count": 69
+                "Epicerie": {
+                    "count": 70
                 },
                 },
-                "Maplin": {
-                    "count": 63
+                "Кировский": {
+                    "count": 67
                 },
                 },
-                "Media Markt": {
-                    "count": 273
+                "Food Mart": {
+                    "count": 101
                 },
                 },
-                "Radio Shack": {
-                    "count": 226
+                "Delikatesy": {
+                    "count": 79
                 },
                 },
-                "Saturn": {
-                    "count": 147
+                "ポプラ": {
+                    "count": 52
                 },
                 },
-                "М.Видео": {
-                    "count": 74
+                "Lewiatan": {
+                    "count": 123
                 },
                 },
-                "Эльдорадо": {
-                    "count": 171
-                }
-            },
-            "furniture": {
-                "But": {
-                    "count": 58
+                "Продуктовый магазин": {
+                    "count": 94
                 },
                 },
-                "Conforama": {
-                    "count": 90
+                "Продуктовый": {
+                    "count": 67
                 },
                 },
-                "Dänisches Bettenlager": {
-                    "count": 290
+                "セイコーマート (Seicomart)": {
+                    "count": 55
                 },
                 },
-                "IKEA": {
-                    "count": 162
+                "Виктория": {
+                    "count": 67
                 },
                 },
-                "Jysk": {
-                    "count": 92
+                "Весна": {
+                    "count": 56
                 },
                 },
-                "Matratzen Concord": {
-                    "count": 51
+                "Mini Market Non-Stop": {
+                    "count": 58
                 },
                 },
-                "Roller": {
-                    "count": 77
+                "QuikTrip": {
+                    "count": 70
                 },
                 },
-                "Мебель": {
-                    "count": 190
-                }
-            },
-            "hairdresser": {
-                "Coiffeur": {
-                    "count": 60
+                "Копеечка": {
+                    "count": 53
                 },
                 },
-                "Franck Provost": {
-                    "count": 64
+                "Royal Farms": {
+                    "count": 51
                 },
                 },
-                "Friseur": {
-                    "count": 127
+                "Alfamart": {
+                    "count": 76
                 },
                 },
-                "Great Clips": {
-                    "count": 155
+                "Indomaret": {
+                    "count": 130
                 },
                 },
-                "Klier": {
-                    "count": 105
+                "магазин": {
+                    "count": 118
                 },
                 },
-                "Peluqueria": {
-                    "count": 56
+                "全家便利商店": {
+                    "count": 111
                 },
                 },
-                "Supercuts": {
-                    "count": 89
+                "Boutique": {
+                    "count": 58
                 },
                 },
-                "Парикмахерская": {
-                    "count": 485
+                "მარკეტი (Market)": {
+                    "count": 144
                 },
                 },
-                "Салон красоты": {
-                    "count": 65
+                "Stores": {
+                    "count": 60
                 }
             },
                 }
             },
-            "hardware": {
-                "1000 мелочей": {
-                    "count": 53
+            "chemist": {
+                "dm": {
+                    "count": 904
                 },
                 },
-                "Хозтовары": {
-                    "count": 143
-                }
-            },
-            "hifi": {},
-            "jewelry": {
-                "Bijou Brigitte": {
-                    "count": 53
+                "Müller": {
+                    "count": 206
                 },
                 },
-                "Christ": {
-                    "count": 55
+                "Schlecker": {
+                    "count": 194
                 },
                 },
-                "Swarovski": {
-                    "count": 70
+                "Etos": {
+                    "count": 465
+                },
+                "Bipa": {
+                    "count": 282
+                },
+                "Rossmann": {
+                    "count": 1652
+                },
+                "Ihr Platz": {
+                    "count": 74
+                },
+                "Douglas": {
+                    "count": 61
+                },
+                "Kruidvat": {
+                    "count": 122
                 }
             },
                 }
             },
-            "mobile_phone": {
-                "AT&T": {
-                    "count": 95
-                },
-                "Bell": {
-                    "count": 191
+            "car_repair": {
+                "Peugeot": {
+                    "count": 82
                 },
                 },
-                "Bitė": {
+                "Kwik Fit": {
                     "count": 73
                 },
                     "count": 73
                 },
-                "Carphone Warehouse": {
-                    "count": 109
+                "ATU": {
+                    "count": 259
                 },
                 },
-                "Movistar": {
-                    "count": 55
+                "Kwik-Fit": {
+                    "count": 51
                 },
                 },
-                "O2": {
-                    "count": 180
+                "Midas": {
+                    "count": 190
                 },
                 },
-                "Orange": {
-                    "count": 220
+                "Feu Vert": {
+                    "count": 105
                 },
                 },
-                "SFR": {
-                    "count": 70
+                "Norauto": {
+                    "count": 141
                 },
                 },
-                "Sprint": {
-                    "count": 91
+                "Speedy": {
+                    "count": 112
                 },
                 },
-                "T-Mobile": {
-                    "count": 158
+                "Автозапчасти": {
+                    "count": 186
                 },
                 },
-                "The Phone House": {
-                    "count": 81
+                "Renault": {
+                    "count": 165
                 },
                 },
-                "Verizon Wireless": {
-                    "count": 97
+                "Pit Stop": {
+                    "count": 57
                 },
                 },
-                "Vodafone": {
-                    "count": 311
+                "Jiffy Lube": {
+                    "count": 187
                 },
                 },
-                "au": {
-                    "count": 56
+                "Шиномонтаж": {
+                    "count": 1097
                 },
                 },
-                "Ð\91илайн": {
-                    "count": 113
+                "СТÐ\9e": {
+                    "count": 366
                 },
                 },
-                "Евросеть": {
-                    "count": 466
+                "O'Reilly Auto Parts": {
+                    "count": 69
                 },
                 },
-                "МТС": {
-                    "count": 311
+                "Carglass": {
+                    "count": 103
                 },
                 },
-                "Мегафон": {
-                    "count": 227
+                "шиномонтаж": {
+                    "count": 56
                 },
                 },
-                "Связной": {
-                    "count": 396
+                "Euromaster": {
+                    "count": 84
                 },
                 },
-                "ソフトバンクショップ (SoftBank shop)": {
-                    "count": 256
+                "Firestone": {
+                    "count": 84
                 },
                 },
-                "ドコモショップ (docomo shop)": {
-                    "count": 113
-                }
-            },
-            "motorcycle": {
-                "Honda": {
-                    "count": 56
+                "AutoZone": {
+                    "count": 63
                 },
                 },
-                "Yamaha": {
-                    "count": 58
+                "Автосервис": {
+                    "count": 344
+                },
+                "Roady": {
+                    "count": 55
                 }
             },
                 }
             },
-            "optician": {
-                "Alain Afflelou": {
-                    "count": 68
+            "furniture": {
+                "IKEA": {
+                    "count": 165
                 },
                 },
-                "Apollo Optik": {
-                    "count": 142
+                "Jysk": {
+                    "count": 98
                 },
                 },
-                "Fielmann": {
-                    "count": 219
+                "Roller": {
+                    "count": 76
                 },
                 },
-                "Krys": {
-                    "count": 65
+                "Dänisches Bettenlager": {
+                    "count": 298
                 },
                 },
-                "Optic 2000": {
-                    "count": 87
+                "Conforama": {
+                    "count": 93
                 },
                 },
-                "Specsavers": {
-                    "count": 109
+                "Matratzen Concord": {
+                    "count": 51
                 },
                 },
-                "Vision Express": {
-                    "count": 54
+                "Мебель": {
+                    "count": 201
                 },
                 },
-                "Оптика": {
-                    "count": 165
+                "But": {
+                    "count": 58
                 }
             },
                 }
             },
-            "pet": {
-                "Das Futterhaus": {
-                    "count": 61
+            "doityourself": {
+                "Hornbach": {
+                    "count": 123
                 },
                 },
-                "Fressnapf": {
-                    "count": 300
+                "B&Q": {
+                    "count": 223
                 },
                 },
-                "PetSmart": {
-                    "count": 150
+                "Hubo": {
+                    "count": 74
                 },
                 },
-                "Petco": {
-                    "count": 79
+                "Mr Bricolage": {
+                    "count": 88
                 },
                 },
-                "Pets at Home": {
-                    "count": 53
+                "Gamma": {
+                    "count": 108
                 },
                 },
-                "Зоомагазин": {
-                    "count": 95
-                }
-            },
-            "shoes": {
-                "Bata": {
-                    "count": 88
+                "OBI": {
+                    "count": 409
                 },
                 },
-                "Brantano": {
-                    "count": 67
+                "Lowes": {
+                    "count": 1135
                 },
                 },
-                "Clarks": {
-                    "count": 97
+                "Wickes": {
+                    "count": 122
                 },
                 },
-                "Deichmann": {
-                    "count": 574
+                "Hagebau": {
+                    "count": 59
                 },
                 },
-                "Ecco": {
-                    "count": 53
+                "Max Bahr": {
+                    "count": 87
                 },
                 },
-                "Foot Locker": {
-                    "count": 74
+                "Castorama": {
+                    "count": 153
                 },
                 },
-                "La Halle aux Chaussures": {
-                    "count": 63
+                "Rona": {
+                    "count": 58
+                },
+                "Home Depot": {
+                    "count": 823
+                },
+                "Toom Baumarkt": {
+                    "count": 66
                 },
                 },
-                "Payless Shoe Source": {
-                    "count": 52
+                "Homebase": {
+                    "count": 223
                 },
                 },
-                "Quick Schuh": {
-                    "count": 69
+                "Baumax": {
+                    "count": 94
                 },
                 },
-                "Reno": {
-                    "count": 170
+                "Lagerhaus": {
+                    "count": 73
                 },
                 },
-                "Salamander": {
-                    "count": 52
+                "Bauhaus": {
+                    "count": 181
                 },
                 },
-                "Обувь": {
+                "Canadian Tire": {
                     "count": 93
                     "count": 93
-                }
-            },
-            "sports": {
-                "Decathlon": {
-                    "count": 286
                 },
                 },
-                "Dick's Sporting Goods": {
-                    "count": 58
+                "Leroy Merlin": {
+                    "count": 203
                 },
                 },
-                "Intersport": {
-                    "count": 265
+                "Hellweg": {
+                    "count": 58
                 },
                 },
-                "Sport 2000": {
-                    "count": 83
+                "Brico": {
+                    "count": 97
                 },
                 },
-                "Sports Authority": {
-                    "count": 63
+                "Bricomarché": {
+                    "count": 217
                 },
                 },
-                "Спортмастер": {
-                    "count": 80
-                }
-            },
-            "stationery": {
-                "McPaper": {
-                    "count": 79
+                "Toom": {
+                    "count": 67
                 },
                 },
-                "Office Depot": {
-                    "count": 83
+                "Praktiker": {
+                    "count": 143
                 },
                 },
-                "Staples": {
-                    "count": 262
+                "Hagebaumarkt": {
+                    "count": 105
                 },
                 },
-                "Канцтовары": {
-                    "count": 57
-                }
-            },
-            "supermarket": {
-                "AD Delhaize": {
+                "Menards": {
                     "count": 66
                 },
                     "count": 66
                 },
-                "ADEG": {
-                    "count": 64
-                },
-                "ALDI": {
-                    "count": 5182
-                },
-                "Aldi Süd": {
-                    "count": 589
+                "Weldom": {
+                    "count": 70
                 },
                 },
-                "ASDA": {
-                    "count": 178
+                "Bunnings Warehouse": {
+                    "count": 90
                 },
                 },
-                "Albert": {
-                    "count": 185
+                "Ace Hardware": {
+                    "count": 133
                 },
                 },
-                "Albert Heijn": {
-                    "count": 445
+                "Home Hardware": {
+                    "count": 69
                 },
                 },
-                "Albertsons": {
-                    "count": 229
+                "Хозтовары": {
+                    "count": 70
                 },
                 },
-                "Aldi Nord": {
-                    "count": 194
+                "Стройматериалы": {
+                    "count": 180
                 },
                 },
-                "Alimerka": {
+                "Bricorama": {
                     "count": 58
                 },
                     "count": 58
                 },
-                "Asda": {
-                    "count": 221
+                "Point P": {
+                    "count": 56
+                }
+            },
+            "department_store": {
+                "Target": {
+                    "count": 530
                 },
                 },
-                "Auchan": {
-                    "count": 144
+                "Debenhams": {
+                    "count": 66
                 },
                 },
-                "Billa": {
-                    "count": 1417
+                "Canadian Tire": {
+                    "count": 71
                 },
                 },
-                "Biedronka": {
-                    "count": 1227
+                "Karstadt": {
+                    "count": 64
                 },
                 },
-                "Bodega Aurrera": {
-                    "count": 70
+                "Walmart": {
+                    "count": 496
                 },
                 },
-                "Budgens": {
-                    "count": 86
+                "Kmart": {
+                    "count": 133
                 },
                 },
-                "C1000": {
-                    "count": 332
+                "Galeria Kaufhof": {
+                    "count": 58
                 },
                 },
-                "CBA": {
-                    "count": 160
+                "Marks & Spencer": {
+                    "count": 62
                 },
                 },
-                "COOP": {
-                    "count": 187
+                "Big W": {
+                    "count": 56
                 },
                 },
-                "COOP Jednota": {
-                    "count": 67
+                "Woolworth": {
+                    "count": 76
                 },
                 },
-                "Caprabo": {
-                    "count": 96
+                "Универмаг": {
+                    "count": 63
                 },
                 },
-                "Carrefour": {
-                    "count": 1575
+                "Sears": {
+                    "count": 218
                 },
                 },
-                "Carrefour City": {
-                    "count": 109
+                "Walmart Supercenter": {
+                    "count": 90
                 },
                 },
-                "Carrefour Contact": {
-                    "count": 73
+                "Sam's Club": {
+                    "count": 51
                 },
                 },
-                "Carrefour Express": {
-                    "count": 314
+                "Kohl's": {
+                    "count": 139
                 },
                 },
-                "Carrefour Market": {
-                    "count": 79
+                "Macy's": {
+                    "count": 129
                 },
                 },
-                "Casino": {
-                    "count": 254
+                "JCPenney": {
+                    "count": 58
+                }
+            },
+            "stationery": {
+                "Staples": {
+                    "count": 276
                 },
                 },
-                "Centra": {
-                    "count": 51
+                "McPaper": {
+                    "count": 80
                 },
                 },
-                "Champion": {
-                    "count": 63
+                "Office Depot": {
+                    "count": 88
                 },
                 },
-                "Checkers": {
-                    "count": 124
+                "Канцтовары": {
+                    "count": 56
+                }
+            },
+            "car": {
+                "Skoda": {
+                    "count": 95
                 },
                 },
-                "Coop": {
-                    "count": 1860
+                "BMW": {
+                    "count": 146
                 },
                 },
-                "Coles": {
-                    "count": 381
+                "Citroen": {
+                    "count": 271
                 },
                 },
-                "Colruyt": {
-                    "count": 186
+                "Renault": {
+                    "count": 365
                 },
                 },
-                "Combi": {
-                    "count": 56
+                "Mercedes-Benz": {
+                    "count": 226
                 },
                 },
-                "Conad": {
-                    "count": 294
+                "Volvo": {
+                    "count": 91
                 },
                 },
-                "Condis": {
-                    "count": 65
+                "Ford": {
+                    "count": 230
                 },
                 },
-                "Consum": {
-                    "count": 123
+                "Volkswagen": {
+                    "count": 203
                 },
                 },
-                "Continente": {
-                    "count": 66
+                "Mazda": {
+                    "count": 99
                 },
                 },
-                "Coop Jednota": {
-                    "count": 68
+                "Mitsubishi": {
+                    "count": 72
                 },
                 },
-                "Coop Konsum": {
-                    "count": 78
+                "Fiat": {
+                    "count": 87
                 },
                 },
-                "Costco": {
-                    "count": 133
+                "Автозапчасти": {
+                    "count": 278
                 },
                 },
-                "Costcutter": {
-                    "count": 62
+                "Opel": {
+                    "count": 162
                 },
                 },
-                "Countdown": {
-                    "count": 90
+                "Audi": {
+                    "count": 109
                 },
                 },
-                "Dia": {
-                    "count": 749
+                "Toyota": {
+                    "count": 256
                 },
                 },
-                "dm": {
-                    "count": 108
+                "Nissan": {
+                    "count": 180
                 },
                 },
-                "Delhaize": {
-                    "count": 219
+                "Suzuki": {
+                    "count": 75
                 },
                 },
-                "Delikatesy Centrum": {
-                    "count": 56
+                "Honda": {
+                    "count": 148
                 },
                 },
-                "Denner": {
+                "Peugeot": {
+                    "count": 296
+                },
+                "Шиномонтаж": {
                     "count": 256
                 },
                     "count": 256
                 },
-                "Despar": {
-                    "count": 143
+                "Hyundai": {
+                    "count": 155
                 },
                 },
-                "Diska": {
-                    "count": 69
+                "Subaru": {
+                    "count": 53
                 },
                 },
-                "Dunnes Stores": {
-                    "count": 70
+                "Chevrolet": {
+                    "count": 81
                 },
                 },
-                "E-Center": {
-                    "count": 67
+                "Автомагазин": {
+                    "count": 62
+                }
+            },
+            "clothes": {
+                "Matalan": {
+                    "count": 84
                 },
                 },
-                "E.Leclerc": {
-                    "count": 341
+                "KiK": {
+                    "count": 1180
                 },
                 },
-                "EDEKA": {
-                    "count": 498
+                "H&M": {
+                    "count": 641
                 },
                 },
-                "Edeka": {
-                    "count": 1811
+                "Urban Outfitters": {
+                    "count": 62
                 },
                 },
-                "El Árbol": {
-                    "count": 71
+                "Vögele": {
+                    "count": 131
                 },
                 },
-                "Eroski": {
-                    "count": 203
+                "Zeeman": {
+                    "count": 120
                 },
                 },
-                "Esselunga": {
-                    "count": 82
+                "Takko": {
+                    "count": 508
                 },
                 },
-                "Eurospar": {
-                    "count": 260
+                "Adler": {
+                    "count": 53
                 },
                 },
-                "Eurospin": {
-                    "count": 153
+                "C&A": {
+                    "count": 498
                 },
                 },
-                "Extra": {
-                    "count": 74
+                "Zara": {
+                    "count": 211
                 },
                 },
-                "Fakta": {
-                    "count": 215
+                "Vero Moda": {
+                    "count": 93
                 },
                 },
-                "Famiglia Cooperativa": {
-                    "count": 62
+                "NKD": {
+                    "count": 476
                 },
                 },
-                "Famila": {
-                    "count": 127
+                "Ernsting's family": {
+                    "count": 298
                 },
                 },
-                "Farmfoods": {
-                    "count": 63
+                "Winners": {
+                    "count": 62
                 },
                 },
-                "Feneberg": {
-                    "count": 61
+                "River Island": {
+                    "count": 56
                 },
                 },
-                "Food Basics": {
-                    "count": 73
+                "Next": {
+                    "count": 170
                 },
                 },
-                "Food Lion": {
-                    "count": 175
+                "Gap": {
+                    "count": 77
                 },
                 },
-                "Foodland": {
-                    "count": 92
+                "Adidas": {
+                    "count": 86
                 },
                 },
-                "Foodworks": {
-                    "count": 55
+                "Woolworths": {
+                    "count": 116
                 },
                 },
-                "Franprix": {
-                    "count": 298
+                "Mr Price": {
+                    "count": 87
                 },
                 },
-                "Fred Meyer": {
-                    "count": 63
+                "Jet": {
+                    "count": 61
                 },
                 },
-                "Fressnapf": {
-                    "count": 66
+                "Pep": {
+                    "count": 134
                 },
                 },
-                "Føtex": {
-                    "count": 67
+                "Edgars": {
+                    "count": 110
                 },
                 },
-                "Game": {
-                    "count": 53
+                "Ackermans": {
+                    "count": 90
                 },
                 },
-                "Giant": {
-                    "count": 187
+                "Truworths": {
+                    "count": 65
                 },
                 },
-                "Giant Eagle": {
-                    "count": 69
+                "Ross": {
+                    "count": 85
                 },
                 },
-                "Géant Casino": {
+                "Dorothy Perkins": {
                     "count": 53
                 },
                     "count": 53
                 },
-                "HEB": {
-                    "count": 75
+                "Deichmann": {
+                    "count": 58
                 },
                 },
-                "HIT": {
-                    "count": 62
+                "Lindex": {
+                    "count": 72
                 },
                 },
-                "Hannaford": {
-                    "count": 55
+                "s.Oliver": {
+                    "count": 54
                 },
                 },
-                "Harris Teeter": {
-                    "count": 84
+                "Old Navy": {
+                    "count": 163
                 },
                 },
-                "Hemköp": {
-                    "count": 83
+                "Jack & Jones": {
+                    "count": 52
                 },
                 },
-                "Hofer": {
-                    "count": 451
+                "Pimkie": {
+                    "count": 72
                 },
                 },
-                "Hoogvliet": {
-                    "count": 52
+                "Esprit": {
+                    "count": 221
                 },
                 },
-                "Hy-Vee": {
-                    "count": 67
+                "Primark": {
+                    "count": 87
                 },
                 },
-                "ICA": {
-                    "count": 195
+                "Bonita": {
+                    "count": 150
                 },
                 },
-                "IGA": {
-                    "count": 333
+                "Mexx": {
+                    "count": 65
                 },
                 },
-                "Iceland": {
-                    "count": 297
+                "Gerry Weber": {
+                    "count": 70
                 },
                 },
-                "Intermarche": {
-                    "count": 107
+                "Tally Weijl": {
+                    "count": 68
                 },
                 },
-                "Intermarché": {
-                    "count": 1155
+                "Mango": {
+                    "count": 128
                 },
                 },
-                "Interspar": {
-                    "count": 142
+                "TK Maxx": {
+                    "count": 77
                 },
                 },
-                "Irma": {
-                    "count": 61
+                "Benetton": {
+                    "count": 99
                 },
                 },
-                "Jumbo": {
-                    "count": 175
+                "Ulla Popken": {
+                    "count": 59
                 },
                 },
-                "K+K": {
-                    "count": 104
+                "AWG": {
+                    "count": 66
                 },
                 },
-                "Kaiser's": {
-                    "count": 255
+                "Tommy Hilfiger": {
+                    "count": 69
                 },
                 },
-                "Kaufland": {
-                    "count": 996
+                "New Yorker": {
+                    "count": 176
                 },
                 },
-                "Kaufpark": {
-                    "count": 100
+                "Orsay": {
+                    "count": 72
                 },
                 },
-                "King Soopers": {
-                    "count": 69
+                "Charles Vögele": {
+                    "count": 68
                 },
                 },
-                "Kiwi": {
-                    "count": 164
+                "New Look": {
+                    "count": 122
                 },
                 },
-                "Konsum": {
-                    "count": 139
+                "Lacoste": {
+                    "count": 73
                 },
                 },
-                "Konzum": {
-                    "count": 225
+                "Etam": {
+                    "count": 52
                 },
                 },
-                "Kroger": {
-                    "count": 280
+                "Kiabi": {
+                    "count": 145
                 },
                 },
-                "Kvickly": {
-                    "count": 54
+                "Jack Wolfskin": {
+                    "count": 60
                 },
                 },
-                "LIDL": {
-                    "count": 901
+                "American Apparel": {
+                    "count": 55
                 },
                 },
-                "Leader Price": {
-                    "count": 242
+                "Men's Wearhouse": {
+                    "count": 51
                 },
                 },
-                "Leclerc": {
-                    "count": 132
+                "Intimissimi": {
+                    "count": 51
                 },
                 },
-                "Lewiatan": {
-                    "count": 88
+                "United Colors of Benetton": {
+                    "count": 93
                 },
                 },
-                "Lider": {
-                    "count": 65
+                "Jules": {
+                    "count": 61
                 },
                 },
-                "Lidl": {
-                    "count": 6116
+                "AOKI": {
+                    "count": 55
                 },
                 },
-                "M-Preis": {
-                    "count": 81
+                "Calzedonia": {
+                    "count": 66
                 },
                 },
-                "MPreis": {
-                    "count": 54
+                "洋服の青山": {
+                    "count": 96
                 },
                 },
-                "Makro": {
-                    "count": 130
+                "Levi's": {
+                    "count": 59
                 },
                 },
-                "Markant": {
-                    "count": 91
+                "Celio": {
+                    "count": 73
                 },
                 },
-                "Marktkauf": {
-                    "count": 133
+                "TJ Maxx": {
+                    "count": 52
                 },
                 },
-                "Match": {
-                    "count": 146
+                "Promod": {
+                    "count": 77
                 },
                 },
-                "Maxi": {
-                    "count": 100
+                "Street One": {
+                    "count": 72
                 },
                 },
-                "Maxima": {
-                    "count": 107
+                "ユニクロ": {
+                    "count": 56
                 },
                 },
-                "Maxima X": {
-                    "count": 111
+                "Banana Republic": {
+                    "count": 51
+                },
+                "Одежда": {
+                    "count": 68
                 },
                 },
-                "Meijer": {
-                    "count": 74
+                "La Halle": {
+                    "count": 61
                 },
                 },
-                "Mercadona": {
-                    "count": 707
+                "Peacocks": {
+                    "count": 87
                 },
                 },
-                "Mercator": {
-                    "count": 119
+                "しまむら": {
+                    "count": 53
+                }
+            },
+            "books": {
+                "Bruna": {
+                    "count": 57
                 },
                 },
-                "Merkur": {
-                    "count": 113
+                "Waterstones": {
+                    "count": 86
                 },
                 },
-                "Metro": {
-                    "count": 250
+                "Libro": {
+                    "count": 55
                 },
                 },
-                "Migros": {
-                    "count": 433
+                "Barnes & Noble": {
+                    "count": 249
                 },
                 },
-                "Minipreço": {
-                    "count": 99
+                "Weltbild": {
+                    "count": 73
                 },
                 },
-                "Monoprix": {
-                    "count": 194
+                "Thalia": {
+                    "count": 120
                 },
                 },
-                "Morrisons": {
-                    "count": 405
+                "Книги": {
+                    "count": 111
+                }
+            },
+            "alcohol": {
+                "Alko": {
+                    "count": 142
                 },
                 },
-                "Netto": {
-                    "count": 4309
+                "The Beer Store": {
+                    "count": 144
                 },
                 },
-                "NORMA": {
-                    "count": 113
+                "Systembolaget": {
+                    "count": 207
                 },
                 },
-                "NP": {
-                    "count": 153
+                "LCBO": {
+                    "count": 226
                 },
                 },
-                "Nah & Frisch": {
-                    "count": 76
+                "Ароматный мир": {
+                    "count": 61
                 },
                 },
-                "Nahkauf": {
-                    "count": 166
+                "Bargain Booze": {
+                    "count": 61
                 },
                 },
-                "Neukauf": {
-                    "count": 81
+                "Nicolas": {
+                    "count": 114
                 },
                 },
-                "New World": {
-                    "count": 67
+                "Botilleria": {
+                    "count": 76
                 },
                 },
-                "No Frills": {
-                    "count": 101
+                "SAQ": {
+                    "count": 70
                 },
                 },
-                "Norma": {
-                    "count": 1054
+                "Gall & Gall": {
+                    "count": 513
                 },
                 },
-                "PENNY": {
-                    "count": 78
+                "BWS": {
+                    "count": 66
                 },
                 },
-                "Pam": {
-                    "count": 53
+                "Живое пиво": {
+                    "count": 61
+                }
+            },
+            "bakery": {
+                "Kamps": {
+                    "count": 250
                 },
                 },
-                "Penny": {
-                    "count": 1766
+                "Bäckerei Schmidt": {
+                    "count": 56
                 },
                 },
-                "Penny Market": {
-                    "count": 397
+                "Anker": {
+                    "count": 70
                 },
                 },
-                "Penny Markt": {
-                    "count": 464
+                "Schäfer": {
+                    "count": 51
                 },
                 },
-                "Petit Casino": {
-                    "count": 106
+                "Hofpfisterei": {
+                    "count": 110
                 },
                 },
-                "Pick n Pay": {
-                    "count": 237
+                "Greggs": {
+                    "count": 265
                 },
                 },
-                "Piggly Wiggly": {
-                    "count": 53
+                "Oebel": {
+                    "count": 58
                 },
                 },
-                "Pingo Doce": {
-                    "count": 238
+                "Boulangerie": {
+                    "count": 248
                 },
                 },
-                "Piotr i Paweł": {
-                    "count": 52
+                "Stadtbäckerei": {
+                    "count": 57
                 },
                 },
-                "Plodine": {
-                    "count": 52
+                "Steinecke": {
+                    "count": 139
                 },
                 },
-                "Plus": {
-                    "count": 138
+                "Ihle": {
+                    "count": 75
                 },
                 },
-                "Polo Market": {
-                    "count": 81
+                "Goldilocks": {
+                    "count": 56
                 },
                 },
-                "Price Chopper": {
-                    "count": 96
+                "Dat Backhus": {
+                    "count": 66
                 },
                 },
-                "Profi": {
+                "K&U": {
                     "count": 55
                 },
                     "count": 55
                 },
-                "Publix": {
-                    "count": 312
+                "Der Beck": {
+                    "count": 97
                 },
                 },
-                "REWE": {
-                    "count": 1440
+                "Thürmann": {
+                    "count": 54
                 },
                 },
-                "Real": {
-                    "count": 257
+                "Backwerk": {
+                    "count": 94
                 },
                 },
-                "Reliance Fresh": {
-                    "count": 63
+                "Bäcker": {
+                    "count": 66
                 },
                 },
-                "Rema 1000": {
-                    "count": 360
+                "Schäfer's": {
+                    "count": 51
                 },
                 },
-                "Rewe": {
-                    "count": 1194
+                "Panaderia": {
+                    "count": 162
                 },
                 },
-                "Rimi": {
-                    "count": 103
+                "Goeken backen": {
+                    "count": 51
                 },
                 },
-                "S-Market": {
-                    "count": 107
+                "Stadtbäckerei Junge": {
+                    "count": 53
                 },
                 },
-                "SPAR": {
-                    "count": 275
+                "Boulangerie Patisserie": {
+                    "count": 93
                 },
                 },
-                "Safeway": {
-                    "count": 436
+                "Paul": {
+                    "count": 78
                 },
                 },
-                "Sainsbury's": {
-                    "count": 538
+                "Хлеб": {
+                    "count": 84
                 },
                 },
-                "Sainsbury's Local": {
-                    "count": 101
+                "Piekarnia": {
+                    "count": 55
+                }
+            },
+            "sports": {
+                "Sports Direct": {
+                    "count": 53
                 },
                 },
-                "Sam's Club": {
-                    "count": 125
+                "Decathlon": {
+                    "count": 298
                 },
                 },
-                "Santa Isabel": {
-                    "count": 123
+                "Intersport": {
+                    "count": 272
                 },
                 },
-                "Shopi": {
-                    "count": 57
+                "Sports Authority": {
+                    "count": 68
                 },
                 },
-                "Shoprite": {
-                    "count": 235
+                "Спортмастер": {
+                    "count": 81
                 },
                 },
-                "Simply Market": {
-                    "count": 310
+                "Sport 2000": {
+                    "count": 83
                 },
                 },
-                "Sobeys": {
-                    "count": 117
+                "Dick's Sporting Goods": {
+                    "count": 69
+                }
+            },
+            "variety_store": {
+                "Tedi": {
+                    "count": 148
                 },
                 },
-                "Soriana": {
+                "Dollarama": {
+                    "count": 99
+                },
+                "Dollar Tree": {
                     "count": 91
                 },
                     "count": 91
                 },
-                "Spar": {
-                    "count": 2028
+                "Dollar General": {
+                    "count": 68
+                }
+            },
+            "pet": {
+                "Fressnapf": {
+                    "count": 309
                 },
                 },
-                "Społem": {
-                    "count": 54
+                "PetSmart": {
+                    "count": 163
                 },
                 },
-                "Stokrotka": {
-                    "count": 84
+                "Das Futterhaus": {
+                    "count": 67
                 },
                 },
-                "Stop & Shop": {
-                    "count": 55
+                "Pets at Home": {
+                    "count": 56
                 },
                 },
-                "Super Brugsen": {
-                    "count": 63
+                "Petco": {
+                    "count": 89
                 },
                 },
-                "Super U": {
-                    "count": 462
+                "Зоомагазин": {
+                    "count": 95
+                }
+            },
+            "shoes": {
+                "Deichmann": {
+                    "count": 607
                 },
                 },
-                "SuperBrugsen": {
-                    "count": 68
+                "Reno": {
+                    "count": 178
                 },
                 },
-                "Tesco": {
-                    "count": 1285
+                "Ecco": {
+                    "count": 54
                 },
                 },
-                "tegut": {
-                    "count": 220
+                "Clarks": {
+                    "count": 100
                 },
                 },
-                "Tengelmann": {
-                    "count": 191
+                "La Halle aux Chaussures": {
+                    "count": 65
                 },
                 },
-                "Tesco Express": {
-                    "count": 373
+                "Brantano": {
+                    "count": 68
                 },
                 },
-                "Tesco Extra": {
-                    "count": 118
+                "Salamander": {
+                    "count": 52
                 },
                 },
-                "Tesco Metro": {
-                    "count": 125
+                "Обувь": {
+                    "count": 97
                 },
                 },
-                "The Co-operative": {
-                    "count": 60
+                "Payless Shoe Source": {
+                    "count": 57
                 },
                 },
-                "The Co-operative Food": {
-                    "count": 113
+                "Famous Footwear": {
+                    "count": 54
                 },
                 },
-                "Trader Joe's": {
-                    "count": 182
+                "Quick Schuh": {
+                    "count": 72
                 },
                 },
-                "Treff 3000": {
-                    "count": 95
+                "Foot Locker": {
+                    "count": 79
                 },
                 },
-                "Unimarc": {
-                    "count": 169
+                "Bata": {
+                    "count": 97
+                }
+            },
+            "toys": {
+                "La Grande Récré": {
+                    "count": 55
                 },
                 },
-                "Unimarkt": {
-                    "count": 80
+                "Toys R Us": {
+                    "count": 141,
+                    "tags": {
+                        "shop": "toys"
+                    }
                 },
                 },
-                "Volg": {
-                    "count": 127
+                "Детский мир": {
+                    "count": 82
                 },
                 },
-                "Waitrose": {
-                    "count": 252
+                "Intertoys": {
+                    "count": 53
                 },
                 },
-                "Walmart": {
-                    "count": 600
+                "Игрушки": {
+                    "count": 57
+                }
+            },
+            "travel_agency": {
+                "Flight Centre": {
+                    "count": 91
                 },
                 },
-                "Walmart Supercenter": {
-                    "count": 103
+                "Thomas Cook": {
+                    "count": 111
+                }
+            },
+            "jewelry": {
+                "Bijou Brigitte": {
+                    "count": 54
                 },
                 },
-                "Wasgau": {
-                    "count": 60
+                "Christ": {
+                    "count": 56
                 },
                 },
-                "Whole Foods": {
-                    "count": 191
+                "Swarovski": {
+                    "count": 73
+                }
+            },
+            "optician": {
+                "Fielmann": {
+                    "count": 222
                 },
                 },
-                "Willys": {
+                "Apollo Optik": {
+                    "count": 147
+                },
+                "Vision Express": {
                     "count": 54
                 },
                     "count": 54
                 },
-                "Woolworths": {
-                    "count": 519
+                "Оптика": {
+                    "count": 175
                 },
                 },
-                "Zielpunkt": {
-                    "count": 240
+                "Optic 2000": {
+                    "count": 90
                 },
                 },
-                "coop": {
+                "Alain Afflelou": {
                     "count": 71
                 },
                     "count": 71
                 },
-                "nahkauf": {
-                    "count": 79
+                "Specsavers": {
+                    "count": 116
                 },
                 },
-                "real,-": {
-                    "count": 80
+                "Krys": {
+                    "count": 70
                 },
                 },
-                "sky": {
-                    "count": 100
+                "Atol": {
+                    "count": 52
+                }
+            },
+            "video": {
+                "Blockbuster": {
+                    "count": 190
                 },
                 },
-                "АТБ": {
-                    "count": 289
+                "World of Video": {
+                    "count": 65
+                }
+            },
+            "mobile_phone": {
+                "Билайн": {
+                    "count": 120
                 },
                 },
-                "Десяточка": {
-                    "count": 51
+                "ソフトバンクショップ (SoftBank shop)": {
+                    "count": 256
                 },
                 },
-                "Дикси": {
-                    "count": 562
+                "Vodafone": {
+                    "count": 335
                 },
                 },
-                "Евроопт": {
-                    "count": 57
+                "O2": {
+                    "count": 190
                 },
                 },
-                "Карусель": {
-                    "count": 55
+                "Carphone Warehouse": {
+                    "count": 116
                 },
                 },
-                "Квартал": {
-                    "count": 93
+                "Orange": {
+                    "count": 236
                 },
                 },
-                "Копейка": {
-                    "count": 96
+                "Verizon Wireless": {
+                    "count": 104
                 },
                 },
-                "Магазин": {
-                    "count": 113
+                "Sprint": {
+                    "count": 97
                 },
                 },
-                "Магнит": {
-                    "count": 1635
+                "T-Mobile": {
+                    "count": 169
                 },
                 },
-                "Ð\9cагнолиÑ\8f": {
-                    "count": 70
+                "Ð\9cТС": {
+                    "count": 334
                 },
                 },
-                "Ð\9cаÑ\80иÑ\8f-Ра": {
-                    "count": 94
+                "Ð\95вÑ\80оÑ\81еÑ\82Ñ\8c": {
+                    "count": 489
                 },
                 },
-                "Монетка": {
-                    "count": 163
+                "Bell": {
+                    "count": 188
                 },
                 },
-                "Народная 7Я семьЯ": {
-                    "count": 147
+                "The Phone House": {
+                    "count": 83
                 },
                 },
-                "Перекресток": {
-                    "count": 310
+                "SFR": {
+                    "count": 69
                 },
                 },
-                "Ð\9fолÑ\83Ñ\88ка": {
-                    "count": 133
+                "СвÑ\8fзной": {
+                    "count": 419
                 },
                 },
-                "Ð\9fÑ\8fÑ\82Ñ\91Ñ\80оÑ\87ка": {
-                    "count": 1232
+                "Ð\9cегаÑ\84он": {
+                    "count": 238
                 },
                 },
-                "Седьмой континент": {
-                    "count": 81
+                "AT&T": {
+                    "count": 111
                 },
                 },
-                "Семья": {
+                "ドコモショップ (docomo shop)": {
+                    "count": 115
+                },
+                "au": {
                     "count": 61
                 },
                     "count": 61
                 },
-                "Сільпо": {
-                    "count": 118
+                "Movistar": {
+                    "count": 69
                 },
                 },
-                "Фора": {
-                    "count": 52
+                "Bitė": {
+                    "count": 72
+                }
+            },
+            "hifi": {},
+            "computer": {
+                "PC World": {
+                    "count": 55
                 },
                 },
-                "Фуршет": {
-                    "count": 76
+                "DNS": {
+                    "count": 124
+                }
+            },
+            "hairdresser": {
+                "Klier": {
+                    "count": 112
                 },
                 },
-                "マルエツ": {
+                "Supercuts": {
+                    "count": 96
+                },
+                "Hairkiller": {
                     "count": 52
                 },
                     "count": 52
                 },
-                "ヨークマート (YorkMart)": {
-                    "count": 62
+                "Great Clips": {
+                    "count": 169
                 },
                 },
-                "西友 (SEIYU)": {
-                    "count": 55
-                }
-            },
-            "toys": {
-                "La Grande Récré": {
-                    "count": 55
+                "Парикмахерская": {
+                    "count": 502
                 },
                 },
-                "Toys R Us": {
-                    "count": 135
+                "Fryzjer": {
+                    "count": 53
                 },
                 },
-                "Детский мир": {
-                    "count": 81
-                }
-            },
-            "travel_agency": {
-                "Flight Centre": {
-                    "count": 85
+                "Franck Provost": {
+                    "count": 67
                 },
                 },
-                "Thomas Cook": {
-                    "count": 100
+                "Салон красоты": {
+                    "count": 67
                 }
             },
                 }
             },
-            "variety_store": {
-                "Dollar General": {
-                    "count": 53
-                },
-                "Dollar Tree": {
-                    "count": 76
+            "hardware": {
+                "1000 мелочей": {
+                    "count": 57
                 },
                 },
-                "Dollarama": {
-                    "count": 90
+                "Хозтовары": {
+                    "count": 149
                 },
                 },
-                "Tedi": {
-                    "count": 138
+                "Стройматериалы": {
+                    "count": 52
                 }
             },
                 }
             },
-            "video": {
-                "Blockbuster": {
-                    "count": 197
+            "motorcycle": {
+                "Yamaha": {
+                    "count": 63
                 },
                 },
-                "World of Video": {
-                    "count": 66
+                "Honda": {
+                    "count": 57
                 }
             }
         }
                 }
             }
         }
The OpenStreetMap web site