diff --git a/administrative.json b/administrative.json
index 7d243f7..8ca7688 100644
--- a/administrative.json
+++ b/administrative.json
@@ -8,7 +8,7 @@
         "en": "Administrative Areas",
         "et": "Administratiivalad",
         "fr": "Zones administratives",
-        "hu": "Adminisztratív határok",
+        "hu": "Közigazgatási határok",
         "it": "Suddivisioni amministrative",
         "nl": "Administratieve gebieden",
         "pt": "Regiões administrativas",
diff --git a/alternative_amenities.json b/alternative_amenities.json
index 969b636..aff6cd9 100644
--- a/alternative_amenities.json
+++ b/alternative_amenities.json
@@ -5,6 +5,7 @@
         "de": "Einrichtungen",
         "en": "Amenities",
         "fr": "Équipement",
+        "hu": "Létesítmények",
         "it": "Infrastrutture",
         "ja": "生活環境",
         "nl": "Voorzieningen",
diff --git a/alternative_routes.json b/alternative_routes.json
index 019e49d..6eb5fa6 100644
--- a/alternative_routes.json
+++ b/alternative_routes.json
@@ -5,6 +5,7 @@
         "de": "(ausgeschilderte) Routen",
         "en": "Routes",
         "fr": "Routes",
+        "hu": "Útvonalak",
         "it": "Itinerari segnalati",
         "ja": "ルート",
         "nl": "Alternatieve routes",
diff --git a/buildings.json b/buildings.json
index eba8b83..5dacc6f 100644
--- a/buildings.json
+++ b/buildings.json
@@ -4,6 +4,7 @@
         "de": "Gebäude",
         "en": "Buildings",
         "fr": "Bâtiments",
+        "hu": "Épületek",
         "pt": "Edifícios",
         "pt-br": "Edificações"
     },
diff --git a/car_amenities.json b/car_amenities.json
index 9351fee..97e47da 100644
--- a/car_amenities.json
+++ b/car_amenities.json
@@ -6,6 +6,7 @@
         "de": "Einrichtungen",
         "en": "Amenities",
         "fr": "Équipements auto",
+        "hu": "Létesítmények",
         "it": "Infrastrutture",
         "ja": "生活環境",
         "nl": "Voorzieningen",
diff --git a/car_furniture.json b/car_furniture.json
index c4afb3d..f479aff 100644
--- a/car_furniture.json
+++ b/car_furniture.json
@@ -5,6 +5,7 @@
         "de": "Straßenausstattung",
         "en": "Street Furniture",
         "fr": "Fournitures automobiles",
+        "hu": "Jelzőtáblák",
         "it": "Dotazioni stradali",
         "ja": "街路設置公共物",
         "nl": "Straatmeubilair",
diff --git a/car_maxspeed.json b/car_maxspeed.json
index ef21652..b2249f3 100644
--- a/car_maxspeed.json
+++ b/car_maxspeed.json
@@ -4,6 +4,7 @@
         "de": "Höchstgeschwindigkeiten",
         "en": "Maxspeed",
         "fr": "Limites de vitesse",
+        "hu": "Sebességkorlátozás",
         "pt": "Velocidade máxima",
         "pt-br": "Velocidade máxima"
     },
@@ -56,7 +57,10 @@
         "listMarkerSymbol": "line",
         "style": {
             "width": "3",
-            "color": "{{ color }}"
+            "color": "{{ color }}",
+            "text": "{{ maxspeed }}           ",
+            "textRepeat": "1",
+            "textFontWeight": "bold"
         }
     },
     "const": {
diff --git a/car_routes.json b/car_routes.json
index 1125d21..a31247e 100644
--- a/car_routes.json
+++ b/car_routes.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "en": "Car routes",
-        "pt-br": "Rota rodoviária"
+        "hu": "Főútvonalak",
+        "pt-br": "Rotas rodoviárias"
     },
     "query": {
         "10": "relation[type=route][route=road]"
@@ -21,7 +22,9 @@
             "{% set refs = [] %}",
             "{% set color = '#d41d8c' %}",
             "{% if tags.ref %}",
-            "  {% set refs = refs|merge([ tags.ref ]) %}",
+            "  {% for ref in tags.ref|split(';') %}",
+            "    {% set refs = refs|merge([ ref|trim ]) %}",
+            "  {% endfor %}",
             "{% endif %}",
             "",
             "{% for master in masters %}",
@@ -31,7 +34,9 @@
             "  {% if master.tags.ref %}",
             "    {% set refs = refs|merge([ master.tags.ref ]) %}",
             "  {% endif %}",
-            "{% endfor %}"
+            "{% endfor %}",
+            "",
+            "{% set refs = refs|unique|natsort({ insensitive: true }) %}"
         ],
         "body": [
             "<h4>Routes</h4>",
@@ -51,7 +56,7 @@
             "color": "{{ color }}",
             "width": 4,
             "opacity": 1,
-            "text": "{{ refs|join('  ') }}             ",
+            "text": "{{ refs|join(' · ') }}             ",
             "textRepeat": "1",
             "textOffset": "12",
             "textFontWeight": "bold"
diff --git a/children.json b/children.json
index 8b40cba..e814ed1 100644
--- a/children.json
+++ b/children.json
@@ -4,6 +4,7 @@
         "de": "Einrichtungen für Kinder",
         "en": "Children amenities",
         "fr": "Équipements pour enfants",
+        "hu": "Gyermekek",
         "pt-br": "Equipamentos infantis"
     },
     "query": {
diff --git a/coal.json b/coal.json
new file mode 100644
index 0000000..ff11913
--- /dev/null
+++ b/coal.json
@@ -0,0 +1,39 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Kohle",
+        "en": "Coal"
+    },
+    "query": {
+        "11": [
+            "(",
+            "node[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+            "way[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+            "relation[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+            "node[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+            "way[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+            "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal)(|;.*)$\"];",
+            "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal)(|;.*)$\"];",
+            "node[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal)(|;.*)$\"];",
+            "way[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal)(|;.*)$\"];",
+            "relation[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal)(|;.*)$\"];",
+            ")"
+        ]
+    },
+    "feature": {
+        "description": [
+            "{% if tags.man_made == 'pipeline' %}",
+            "{{ tagTrans('man_made', 'pipeline') }} ({{ tagTrans('substance', tags.substance) }})",
+            "{% elseif tags.man_made %}",
+            "{{ tagTrans('man_made', tags.man_made) }}",
+            "{% elseif tags.power == 'plant' %}",
+            "{{ tagTrans('power', 'plant') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
+            "{% elseif tags.landuse == 'quarry' %}",
+            "{{ tagTrans('landuse', tags.landuse) }} {% if tags.resource %}({{ tagTrans('resource', tags.resource) }}){% endif %}",
+            "{% elseif tags.landuse == 'industrial' %}",
+            "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})",
+            "{% endif %}"
+        ],
+        "markerSymbol": null
+    }
+}
diff --git a/construction.json b/construction.json
index 0839228..73495f7 100644
--- a/construction.json
+++ b/construction.json
@@ -6,6 +6,7 @@
         "de": "Baustellen",
         "en": "Construction Sites",
         "fr": "Constructions",
+        "hu": "Építési terület",
         "it": "Cantieri",
         "ja": "工事中",
         "nl": "Bouwterrein",
diff --git a/craft.json b/craft.json
index c1b119b..f9c49d4 100644
--- a/craft.json
+++ b/craft.json
@@ -4,6 +4,7 @@
         "de": "Handwerk",
         "en": "Craft",
         "fr": "Artisanat",
+        "hu": "Műhelyek",
         "pt": "Artesanato",
         "pt-br": "Ofícios"
     },
diff --git a/culture_religion.json b/culture_religion.json
index ee1cd5d..52cc1a5 100644
--- a/culture_religion.json
+++ b/culture_religion.json
@@ -10,7 +10,7 @@
         "es": "Cultura y religión",
         "et": "Kultuur ja religioon",
         "fr": "Culture et Religion",
-        "hu": "Kultúra",
+        "hu": "Kultúra és vallás",
         "it": "Cultura",
         "ja": "文化",
         "nl": "Cultuur",
@@ -28,6 +28,9 @@
         {
             "id": "historic"
         },
+        {
+            "id": "memorial"
+        },
         {
             "id": "religion"
         },
diff --git a/cycle_amenities.json b/cycle_amenities.json
index f1bfac9..925ade8 100644
--- a/cycle_amenities.json
+++ b/cycle_amenities.json
@@ -4,6 +4,7 @@
         "de": "Einrichtungen",
         "en": "Amenities",
         "fr": "Équipements vélo",
+        "hu": "Kerékpáros létesítmények",
         "pt-br": "Equipamentos"
     },
     "query": {
diff --git a/cycle_routes.json b/cycle_routes.json
index 5df6c4c..3844eec 100644
--- a/cycle_routes.json
+++ b/cycle_routes.json
@@ -4,6 +4,7 @@
         "de": "Radrouten",
         "en": "Cycle Routes",
         "fr": "Itinéraires vélo",
+        "hu": "Kerékpáros útvonalak",
         "pt": "Ciclovias",
         "pt-br": "Ciclorrotas"
     },
@@ -57,7 +58,7 @@
             "color": "{{ const[network].color }}",
             "width": 4,
             "opacity": 1,
-            "text": "{{ refs|join('  ') }}             ",
+            "text": "{{ refs|join(' · ') }}             ",
             "textRepeat": "1",
             "textOffset": "12",
             "textFontWeight": "bold"
diff --git a/detailsBody.html b/detailsBody.html
index 303db55..6b8d180 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -93,8 +93,11 @@
   <i class="fa fa-money" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('payment') }}:</span>
   <span class='value'>
+    {% set i = 0 %}
     {% for k, tag in payment %}
-    {% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
+    {%- if i > 0 %},{% endif %}
+    <span title="{{ tagTrans(k, tags[tag]) }}">{% if tags[tag] == 'no' %}<s>{{ keyTrans(tag, { default: k }) }}</s>{% else %}{{ keyTrans(tag, { default: k }) }}{% endif -%}</span>
+    {% set i = i + 1 -%}
     {% endfor %}
   </span>
 </li>
diff --git a/education.json b/education.json
index 57bdc3d..c366e82 100644
--- a/education.json
+++ b/education.json
@@ -8,6 +8,7 @@
         "en": "Educational Services",
         "et": "Haridusteenused",
         "fr": "Éducation",
+        "hu": "Oktatás",
         "it": "Istruzione",
         "ja": "教育サービス",
         "nl": "Onderwijs",
diff --git a/power.json b/electric_power.json
similarity index 96%
rename from power.json
rename to electric_power.json
index 4be4028..ce31be5 100644
--- a/power.json
+++ b/electric_power.json
@@ -3,8 +3,8 @@
     "name": {
         "ast": "Enerxía",
         "cs": "Elektřina",
-        "de": "Energie",
-        "en": "Power",
+        "de": "Elektrischer Strom",
+        "en": "Electric Power",
         "et": "Elekter",
         "fr": "Énergie",
         "hu": "Áramellátás",
diff --git a/emergency.json b/emergency.json
index 588c14d..64ef840 100644
--- a/emergency.json
+++ b/emergency.json
@@ -10,6 +10,7 @@
         "es": "Servicios de emergencia",
         "et": "Hädaabi teenused",
         "fr": "Services d'urgence",
+        "hu": "Vészhelyzet",
         "it": "Servizi d'emergenza",
         "ja": "緊急サービス",
         "nl": "Hulpdiensten",
diff --git a/financial.json b/financial.json
index 0320bbc..b0ea37a 100644
--- a/financial.json
+++ b/financial.json
@@ -7,6 +7,7 @@
         "el": "Χρήμα",
         "en": "Financial",
         "fr": "Finance",
+        "hu": "Pénzügyek",
         "it": "Finanze",
         "ja": "金融",
         "nl": "Financieel",
diff --git a/gastro-smoking.json b/gastro-smoking.json
index 2bd2b6f..e3be9d7 100644
--- a/gastro-smoking.json
+++ b/gastro-smoking.json
@@ -4,6 +4,7 @@
         "de": "Rauchfreie Gastronomie",
         "en": "Smokefree Gastronomy",
         "fr": "Restauration sans tabac",
+        "hu": "Nem dohányzó vendéglátóhelyek",
         "pt": "Restauração livre de tabaco",
         "pt-br": "Gastronomia sem fumo"
     },
diff --git a/gastro.json b/gastro.json
index 369ff4c..d838586 100644
--- a/gastro.json
+++ b/gastro.json
@@ -7,7 +7,7 @@
         "el": "Γαστρονομία",
         "en": "Gastronomy",
         "fr": "Restauration",
-        "hu": "Gasztronómia",
+        "hu": "Vendéglátás",
         "it": "Gastronomia",
         "ja": "食べ物",
         "nl": "Gastronomie",
diff --git a/health.json b/health.json
index 08e3cd2..a540782 100644
--- a/health.json
+++ b/health.json
@@ -7,6 +7,7 @@
         "el": "Υγεία",
         "en": "Health",
         "fr": "Santé",
+        "hu": "Egészségügy",
         "it": "Sanità",
         "ja": "健康",
         "nl": "Gezondheid",
@@ -60,7 +61,7 @@
             "{{ tagTransList('healthcare:speciality', attribute(tags, 'healthcare:speciality')) }}",
             "{% endif %}"
         ],
-        "markerSign": "{{ const[concat(key, '=', value)]|raw }}"
+        "markerSign": "{{ const[key ~ '=' ~ value]|raw }}"
     },
     "info": [
         "<table>",
diff --git a/hiking_routes.json b/hiking_routes.json
index 97e20b0..3bf40d9 100644
--- a/hiking_routes.json
+++ b/hiking_routes.json
@@ -4,6 +4,7 @@
         "de": "Wanderrouten",
         "en": "Hiking routes",
         "fr": "Itinéraires pédestres",
+        "hu": "Turistautak",
         "pt": "Rotas de caminhada",
         "pt-br": "Rotas de caminhada"
     },
@@ -56,7 +57,7 @@
             "color": "{{ const[network].color }}",
             "width": 4,
             "opacity": 1,
-            "text": "{{ refs|join('  ') }}             ",
+            "text": "{{ refs|join(' · ') }}             ",
             "textRepeat": "1",
             "textOffset": "12",
             "textFontWeight": "bold"
diff --git a/historic.json b/historic.json
index 76c2e27..f09cf10 100644
--- a/historic.json
+++ b/historic.json
@@ -8,7 +8,7 @@
         "en": "Historic",
         "et": "Ajalooline",
         "fr": "Histoire",
-        "hu": "Historikus",
+        "hu": "Történelmi objektumok",
         "it": "Storia",
         "ja": "記念",
         "nl": "Historisch",
@@ -22,16 +22,16 @@
     "query": {
         "11": [
             "(",
-            "node[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
-            "way[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
-            "relation[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
+            "node[historic~\"^(castle|archaeological_site|battlefield)$\"];",
+            "way[historic~\"^(castle|archaeological_site|battlefield)$\"];",
+            "relation[historic~\"^(castle|archaeological_site|battlefield)$\"];",
             ")"
         ],
         "14": [
             "(",
-            "node[historic];",
-            "way[historic];",
-            "relation[historic];",
+            "node[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine|wayside_chapel)$\"];",
+            "way[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine|wayside_chapel)$\"];",
+            "relation[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine|wayside_chapel)$\"];",
             ")"
         ]
     },
@@ -73,14 +73,6 @@
         "aircraft": {
             "sign": "<img src='maki:airport'>",
             "zoom": 14
-        },
-        "memorial": {
-            "sign": "<span  style='position: relative; top: -2px;'><img src='maki:monument?size=11'></span>",
-            "zoom": 14
-        },
-        "monument": {
-            "sign": "<img src='maki:monument?size=15'>",
-            "zoom": 11
         }
     }
 }
diff --git a/index.json b/index.json
index e223697..1b56e05 100644
--- a/index.json
+++ b/index.json
@@ -14,7 +14,7 @@
                 "es": "Ocio, deporte y compras",
                 "et": "Vaba aeg, sport ja ostmine",
                 "fr": "Loisirs",
-                "hu": "Szabadidő",
+                "hu": "Szabadidő, sport és vásárlás",
                 "it": "Tempo libero, sport e shopping",
                 "ja": "レジャー",
                 "nl": "Vrije tijd, Sport en Winkelen",
@@ -62,7 +62,7 @@
                 "es": "Servicios",
                 "et": "Teenused",
                 "fr": "Services",
-                "hu": "Szolgáltatás",
+                "hu": "Szolgáltatások",
                 "it": "Servizi",
                 "ja": "サービス",
                 "nl": "Dienstverlening",
@@ -131,7 +131,8 @@
                         "en": "Walking",
                         "fr": "Marche à pied",
                         "pt-br": "Pedestre",
-                        "pt": "Pedestre"
+                        "pt": "Pedestre",
+                        "hu": "Gyalogos közlekedés"
                     },
                     "subCategories": [
                         {
@@ -150,7 +151,8 @@
                         "en": "Cycling",
                         "fr": "Cyclisme",
                         "pt-br": "Ciclismo",
-                        "pt": "Ciclismo"
+                        "pt": "Ciclismo",
+                        "hu": "Kerékpáros közlekedés"
                     },
                     "subCategories": [
                         {
@@ -209,7 +211,8 @@
                         "ru": "Частный транспорт",
                         "uk": "Приватний транспорт",
                         "pt-br": "Tráfego individual",
-                        "pt": "Transporte individual"
+                        "pt": "Transporte individual",
+                        "hu": "Autós közlekedés"
                     },
                     "subCategories": [
                         {
@@ -233,7 +236,8 @@
                 "en": "Infrastructure",
                 "fr": "Infrastructures",
                 "pt-br": "Infraestrutura",
-                "pt": "Infraestrutura"
+                "pt": "Infraestrutura",
+                "hu": "Infrastruktúra"
             },
             "subCategories": [
                 {
@@ -246,7 +250,23 @@
                     "id": "military"
                 },
                 {
-                    "id": "power"
+                    "id": "energy",
+                    "type": "index",
+                    "name": {
+                        "en": "Energy",
+                        "de": "Energie"
+                    },
+                    "subCategories": [
+                        {
+                            "id": "electric_power"
+                        },
+                        {
+                            "id": "coal"
+                        },
+                        {
+                            "id": "oil_gas"
+                        }
+                    ]
                 },
                 {
                     "id": "railway",
@@ -273,6 +293,9 @@
                         {
                             "id": "railway-electrification"
                         },
+                        {
+                            "id": "railway-maxspeed"
+                        },
                         {
                             "id": "railway-routes"
                         }
@@ -303,7 +326,8 @@
                 "de": "Spezial",
                 "pt-br": "Especial",
                 "fr": "Catégories spéciales",
-                "pt": "Especial"
+                "pt": "Especial",
+                "hu": "Speciális"
             },
             "subCategories": [
                 {
@@ -316,6 +340,7 @@
         }
     ],
     "name": {
+        "hu": "Tartalom",
         "pt-br": "Índice"
     }
 }
diff --git a/internet.json b/internet.json
index 04454ce..d6e9b51 100644
--- a/internet.json
+++ b/internet.json
@@ -7,7 +7,7 @@
         "en": "Internet access",
         "es": "Acceso a Internet",
         "fr": "Internet",
-        "hu": "Internethozzáférés",
+        "hu": "Internetcsatlakozás",
         "ja": "インターネット接続",
         "nl": "Internettoegang",
         "pt": "Acesso à Internet",
diff --git a/lang/ast.json b/lang/ast.json
index 54948ae..bbf1fe4 100644
--- a/lang/ast.json
+++ b/lang/ast.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "Infraestructures",
     "category:car_furniture": "Acondicionamientu urbanu",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Comunicaciones",
     "category:construction": "Sitios d'obres",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "Servicios educativos",
+    "category:electric_power": "Enerxía",
     "category:emergency": "Servicios d'emerxencia",
+    "category:energy": "",
     "category:financial": "Dineru",
-    "category:gastro-smoking": "",
     "category:gastro": "Gastronomía",
+    "category:gastro-smoking": "",
     "category:health": "Salú",
     "category:hiking_routes": "",
     "category:historic": "Hestoria",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "Accesu a Internet",
     "category:leisure": "Recréu",
+    "category:leisure_sport_shopping": "Recréu, deportes y compres",
+    "category:memorial": "",
     "category:military": "Militar",
     "category:mtb-routes": "",
     "category:natural": "Formaciones naturales",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Otres",
     "category:outdoor": "",
     "category:phone": "Teléfonos",
@@ -36,32 +45,34 @@
     "category:places_geo": "Llugares",
     "category:playgrounds": "Xuegos infantiles",
     "category:post": "Corréu",
-    "category:power": "Enerxía",
     "category:pt": "",
-    "category:pt:stops": "Paraes y estaciones",
     "category:pt:routes": "",
+    "category:pt:stops": "Paraes y estaciones",
     "category:pt_amenities": "Infraestructures",
     "category:public": "Serviciu Públicu",
+    "category:railway": "Ferrocarril",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Relixón",
     "category:residential": "Zones residenciales",
     "category:resources": "Estraición de recursos",
+    "category:services": "Servicios",
     "category:shop": "Compres",
+    "category:special": "",
     "category:sport": "Deportes",
     "category:tourism_attractions": "Turismu",
     "category:tourism_services": "Turismu",
+    "category:transport": "Tresporte",
     "category:transport_alternative": "Alternativu (Ciclismu, senderismu, ...)",
+    "category:transport_car": "Tráficu individual",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Tresporte Públicu",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "Basures",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "Fábriques",
-    "category:leisure_sport_shopping": "Recréu, deportes y compres",
-    "category:railway": "Ferrocarril",
-    "category:services": "Servicios",
-    "category:transport": "Tresporte",
-    "category:transport_car": "Tráficu individual",
-    "category:transport_pt": "Tresporte Públicu"
+    "category:works": "Fábriques"
 }
diff --git a/lang/ca.json b/lang/ca.json
index de49b3a..817dabd 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Comunicacions",
     "category:construction": "",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "",
+    "category:electric_power": "",
     "category:emergency": "Serveis d'emergència",
+    "category:energy": "",
     "category:financial": "",
-    "category:gastro-smoking": "",
     "category:gastro": "",
+    "category:gastro-smoking": "",
     "category:health": "",
     "category:hiking_routes": "",
     "category:historic": "",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "Accés a Internet",
     "category:leisure": "",
+    "category:leisure_sport_shopping": "Oci, esport i compres",
+    "category:memorial": "",
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "",
     "category:outdoor": "",
     "category:phone": "",
@@ -36,28 +45,34 @@
     "category:places_geo": "",
     "category:playgrounds": "",
     "category:post": "",
-    "category:power": "",
     "category:pt": "",
-    "category:pt:stops": "",
     "category:pt:routes": "",
+    "category:pt:stops": "",
     "category:pt_amenities": "",
     "category:public": "",
+    "category:railway": "",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "",
     "category:residential": "",
     "category:resources": "",
+    "category:services": "Serveis",
     "category:shop": "",
+    "category:special": "",
     "category:sport": "",
     "category:tourism_attractions": "",
     "category:tourism_services": "",
+    "category:transport": "",
     "category:transport_alternative": "",
+    "category:transport_car": "",
+    "category:transport_cycle": "",
+    "category:transport_pt": "",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "",
-    "category:leisure_sport_shopping": "Oci, esport i compres",
-    "category:services": "Serveis"
+    "category:works": ""
 }
diff --git a/lang/cs.json b/lang/cs.json
index 14c38f7..3983a25 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "Občasnká vybavenost",
     "category:car_furniture": "Pouliční přislušenství",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Komunikace",
     "category:construction": "Staveniště",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "Vzdělávací služby",
+    "category:electric_power": "Elektřina",
     "category:emergency": "Pohotovostní služby",
+    "category:energy": "",
     "category:financial": "Finanční služby",
-    "category:gastro-smoking": "",
     "category:gastro": "Stravování",
+    "category:gastro-smoking": "",
     "category:health": "Zdravotnictví",
     "category:hiking_routes": "",
     "category:historic": "Historické",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "Přístup k internetu",
     "category:leisure": "Volný čas",
+    "category:leisure_sport_shopping": "Volný čas, sporty a nákupy",
+    "category:memorial": "",
     "category:military": "Vojenské",
     "category:mtb-routes": "",
     "category:natural": "Přírodní úkazy",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Jiné",
     "category:outdoor": "",
     "category:phone": "Telefony",
@@ -36,32 +45,34 @@
     "category:places_geo": "Sídla",
     "category:playgrounds": "Hřiště",
     "category:post": "Poštovní služby",
-    "category:power": "Elektřina",
     "category:pt": "",
-    "category:pt:stops": "Zastávky & Stanice",
     "category:pt:routes": "",
+    "category:pt:stops": "Zastávky & Stanice",
     "category:pt_amenities": "Občanská vybavenost",
     "category:public": "Veřejné služby",
+    "category:railway": "Železnice",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Religion",
     "category:residential": "Obytné oblasti",
     "category:resources": "Těžba surovin",
+    "category:services": "Služby",
     "category:shop": "Obchody",
+    "category:special": "",
     "category:sport": "Sport",
     "category:tourism_attractions": "Turistika",
     "category:tourism_services": "Turistika",
+    "category:transport": "Doprava",
     "category:transport_alternative": "Alternativní (Cyklistika, Pěší turistika, ...)",
+    "category:transport_car": "Individuální doprava",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Veřejná doprava",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "Nakládání s odpady",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "Továrny",
-    "category:leisure_sport_shopping": "Volný čas, sporty a nákupy",
-    "category:railway": "Železnice",
-    "category:services": "Služby",
-    "category:transport": "Doprava",
-    "category:transport_car": "Individuální doprava",
-    "category:transport_pt": "Veřejná doprava"
+    "category:works": "Továrny"
 }
diff --git a/lang/de.json b/lang/de.json
index 1f9715d..e489992 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "Einrichtungen",
     "category:car_furniture": "Straßenausstattung",
     "category:car_maxspeed": "Höchstgeschwindigkeiten",
+    "category:car_routes": "",
     "category:children": "Einrichtungen für Kinder",
+    "category:coal": "Kohle",
     "category:communication": "Kommunikation",
     "category:construction": "Baustellen",
     "category:craft": "Handwerk",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "Einrichtungen",
     "category:cycle_routes": "Radrouten",
     "category:education": "Bildungseinrichtungen",
+    "category:electric_power": "Elektrischer Strom",
     "category:emergency": "Notfalldienste",
+    "category:energy": "Energie",
     "category:financial": "Finanzen",
-    "category:gastro-smoking": "Rauchfreie Gastronomie",
     "category:gastro": "Gastronomie",
+    "category:gastro-smoking": "Rauchfreie Gastronomie",
     "category:health": "Gesundheitsdienste",
     "category:hiking_routes": "Wanderrouten",
     "category:historic": "Geschichte",
     "category:index": "",
+    "category:infrastructure": "Infrastruktur",
     "category:internet": "Internetzugang",
     "category:leisure": "Freizeit",
+    "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf",
+    "category:memorial": "Denkmäler",
     "category:military": "Militär",
     "category:mtb-routes": "",
     "category:natural": "Geographische Objekte",
+    "category:network": "",
+    "category:oil_gas": "Erdöl und Erdgas",
     "category:other": "Andere",
     "category:outdoor": "Freiluftaktivitäten",
     "category:phone": "Telekommunikation",
@@ -36,36 +45,34 @@
     "category:places_geo": "Orte",
     "category:playgrounds": "Spielplätze",
     "category:post": "Post",
-    "category:power": "Energie",
     "category:pt": "ÖV Karte",
-    "category:pt:stops": "Haltestellen",
     "category:pt:routes": "Routen",
+    "category:pt:stops": "Haltestellen",
     "category:pt_amenities": "Einrichtungen",
     "category:public": "Öffentliche Dienste",
+    "category:railway": "Eisenbahn",
     "category:railway-electrification": "Eisenbahn Elektrifizierung",
     "category:railway-infrastructure": "Eisenbahn Infrastruktur",
+    "category:railway-maxspeed": "Eisenbahn Höchstgeschwindigkeiten",
     "category:railway-routes": "",
     "category:religion": "Religion",
     "category:residential": "Wohngebiete",
     "category:resources": "Ressourcengewinnung",
+    "category:services": "Dienste",
     "category:shop": "Einkauf",
+    "category:special": "Spezial",
     "category:sport": "Sport",
     "category:tourism_attractions": "Tourismus",
     "category:tourism_services": "Tourismus",
+    "category:transport": "Transport",
     "category:transport_alternative": "",
+    "category:transport_car": "Motorisierter Individualverkehr",
+    "category:transport_cycle": "Radfahren",
+    "category:transport_pt": "Öffentlicher Verkehr",
+    "category:transport_walk": "Zu Fuß gehen",
     "category:walk_amenities": "Einrichtungen",
     "category:waste": "Entsorgung",
     "category:water": "Gewässer",
     "category:wikipedia": "Wikipedia",
-    "category:works": "Fabriken",
-    "category:infrastructure": "Infrastruktur",
-    "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf",
-    "category:railway": "Eisenbahn",
-    "category:services": "Dienste",
-    "category:special": "Spezial",
-    "category:transport": "Transport",
-    "category:transport_car": "Motorisierter Individualverkehr",
-    "category:transport_cycle": "Radfahren",
-    "category:transport_pt": "Öffentlicher Verkehr",
-    "category:transport_walk": "Zu Fuß gehen"
+    "category:works": "Fabriken"
 }
diff --git a/lang/el.json b/lang/el.json
index a629d53..c25f63f 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Επικοινωνίες",
     "category:construction": "",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "Υπηρεσίες Εκπαίδευσης",
+    "category:electric_power": "",
     "category:emergency": "Υπηρεσίες Έκτακτης Ανάγκης",
+    "category:energy": "",
     "category:financial": "Χρήμα",
-    "category:gastro-smoking": "",
     "category:gastro": "Γαστρονομία",
+    "category:gastro-smoking": "",
     "category:health": "Υγεία",
     "category:hiking_routes": "",
     "category:historic": "Ιστορικά",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "",
     "category:leisure": "Αναψυχή",
+    "category:leisure_sport_shopping": "Αναψυχή, Αθλητισμός και Αγορές",
+    "category:memorial": "",
     "category:military": "Στρατιωτικό",
     "category:mtb-routes": "",
     "category:natural": "Φυσικοί Σχηματισμοί",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "",
     "category:outdoor": "",
     "category:phone": "",
@@ -36,30 +45,34 @@
     "category:places_geo": "Μέρη",
     "category:playgrounds": "",
     "category:post": "",
-    "category:power": "",
     "category:pt": "",
-    "category:pt:stops": "Στάσεις & Σταθμοί",
     "category:pt:routes": "",
+    "category:pt:stops": "Στάσεις & Σταθμοί",
     "category:pt_amenities": "",
     "category:public": "Δημόσιες Υπηρεσίες",
+    "category:railway": "",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Θρησκεία",
     "category:residential": "Περιοχές Κατοικίας",
     "category:resources": "",
+    "category:services": "Υπηρεσίες",
     "category:shop": "Αγορές",
+    "category:special": "",
     "category:sport": "Άθληση",
     "category:tourism_attractions": "Τουρισμός",
     "category:tourism_services": "Τουρισμός",
+    "category:transport": "Μεταφορές",
     "category:transport_alternative": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
+    "category:transport_car": "",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Δημόσιες Μεταφορές",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "",
-    "category:leisure_sport_shopping": "Αναψυχή, Αθλητισμός και Αγορές",
-    "category:services": "Υπηρεσίες",
-    "category:transport": "Μεταφορές",
-    "category:transport_pt": "Δημόσιες Μεταφορές"
+    "category:works": ""
 }
diff --git a/lang/en.json b/lang/en.json
index c5920a4..46851f2 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "Amenities",
     "category:car_furniture": "Street Furniture",
     "category:car_maxspeed": "Maxspeed",
+    "category:car_routes": "Car routes",
     "category:children": "Children amenities",
+    "category:coal": "Coal",
     "category:communication": "Communication",
     "category:construction": "Construction Sites",
     "category:craft": "Craft",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "Amenities",
     "category:cycle_routes": "Cycle Routes",
     "category:education": "Educational Services",
+    "category:electric_power": "Electric Power",
     "category:emergency": "Emergency Services",
+    "category:energy": "Energy",
     "category:financial": "Financial",
-    "category:gastro-smoking": "Smokefree Gastronomy",
     "category:gastro": "Gastronomy",
+    "category:gastro-smoking": "Smokefree Gastronomy",
     "category:health": "Health",
     "category:hiking_routes": "Hiking routes",
     "category:historic": "Historic",
     "category:index": "",
+    "category:infrastructure": "Infrastructure",
     "category:internet": "Internet access",
     "category:leisure": "Leisure",
+    "category:leisure_sport_shopping": "Leisure, Sport and Shopping",
+    "category:memorial": "Memorials",
     "category:military": "Military",
     "category:mtb-routes": "Mountain bike routes",
     "category:natural": "Natural Formations",
+    "category:network": "Network infrastructure",
+    "category:oil_gas": "Petroleum and natural gas",
     "category:other": "Other",
     "category:outdoor": "Outdoor activities",
     "category:phone": "Phone",
@@ -36,36 +45,34 @@
     "category:places_geo": "Places",
     "category:playgrounds": "Playground",
     "category:post": "Post",
-    "category:power": "Power",
     "category:pt": "Public transport map",
-    "category:pt:stops": "Stops & Stations",
     "category:pt:routes": "Routes",
+    "category:pt:stops": "Stops & Stations",
     "category:pt_amenities": "Amenities",
     "category:public": "Public Services",
+    "category:railway": "Railway",
     "category:railway-electrification": "Railway electrification",
     "category:railway-infrastructure": "Railway infrastructure",
+    "category:railway-maxspeed": "Railway Maxspeed",
     "category:railway-routes": "Railway Routes",
     "category:religion": "Religion",
     "category:residential": "Residential Areas",
     "category:resources": "Resource Extraction",
+    "category:services": "Services",
     "category:shop": "Shopping",
+    "category:special": "Special",
     "category:sport": "Sport",
     "category:tourism_attractions": "Tourism",
     "category:tourism_services": "Tourism",
+    "category:transport": "Transportation",
     "category:transport_alternative": "",
+    "category:transport_car": "Individual Traffic",
+    "category:transport_cycle": "Cycling",
+    "category:transport_pt": "Public Transportation",
+    "category:transport_walk": "Walking",
     "category:walk_amenities": "Amenities",
     "category:waste": "Disposal",
     "category:water": "Waterbodies",
     "category:wikipedia": "Wikipedia",
-    "category:works": "Works",
-    "category:infrastructure": "Infrastructure",
-    "category:leisure_sport_shopping": "Leisure, Sport and Shopping",
-    "category:railway": "Railway",
-    "category:services": "Services",
-    "category:special": "Special",
-    "category:transport": "Transportation",
-    "category:transport_car": "Individual Traffic",
-    "category:transport_cycle": "Cycling",
-    "category:transport_pt": "Public Transportation",
-    "category:transport_walk": "Walking"
+    "category:works": "Works"
 }
diff --git a/lang/es.json b/lang/es.json
index 18d7d3e..853d88b 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "",
     "category:construction": "",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "",
+    "category:electric_power": "",
     "category:emergency": "Servicios de emergencia",
+    "category:energy": "",
     "category:financial": "",
-    "category:gastro-smoking": "",
     "category:gastro": "",
+    "category:gastro-smoking": "",
     "category:health": "",
     "category:hiking_routes": "",
     "category:historic": "",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "Acceso a Internet",
     "category:leisure": "",
+    "category:leisure_sport_shopping": "Ocio, deporte y compras",
+    "category:memorial": "",
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "",
     "category:outdoor": "",
     "category:phone": "",
@@ -36,28 +45,34 @@
     "category:places_geo": "",
     "category:playgrounds": "",
     "category:post": "",
-    "category:power": "",
     "category:pt": "",
-    "category:pt:stops": "Paradas y estaciones",
     "category:pt:routes": "",
+    "category:pt:stops": "Paradas y estaciones",
     "category:pt_amenities": "",
     "category:public": "",
+    "category:railway": "",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "",
     "category:residential": "",
     "category:resources": "",
+    "category:services": "Servicios",
     "category:shop": "",
+    "category:special": "",
     "category:sport": "",
     "category:tourism_attractions": "",
     "category:tourism_services": "",
+    "category:transport": "",
     "category:transport_alternative": "",
+    "category:transport_car": "",
+    "category:transport_cycle": "",
+    "category:transport_pt": "",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "",
-    "category:leisure_sport_shopping": "Ocio, deporte y compras",
-    "category:services": "Servicios"
+    "category:works": ""
 }
diff --git a/lang/et.json b/lang/et.json
index fcd6066..2a1d43e 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Kommunikatsioon",
     "category:construction": "",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "Haridusteenused",
+    "category:electric_power": "Elekter",
     "category:emergency": "Hädaabi teenused",
+    "category:energy": "",
     "category:financial": "",
-    "category:gastro-smoking": "",
     "category:gastro": "",
+    "category:gastro-smoking": "",
     "category:health": "",
     "category:hiking_routes": "",
     "category:historic": "Ajalooline",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "",
     "category:leisure": "",
+    "category:leisure_sport_shopping": "Vaba aeg, sport ja ostmine",
+    "category:memorial": "",
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Ülejäänud",
     "category:outdoor": "",
     "category:phone": "Telefon",
@@ -36,31 +45,34 @@
     "category:places_geo": "Kohad",
     "category:playgrounds": "Mänguväljak",
     "category:post": "",
-    "category:power": "Elekter",
     "category:pt": "",
-    "category:pt:stops": "",
     "category:pt:routes": "",
+    "category:pt:stops": "",
     "category:pt_amenities": "",
     "category:public": "Kommunaalteenused",
+    "category:railway": "Raudtee",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Religioon",
     "category:residential": "Elamupiirkonnad",
     "category:resources": "",
+    "category:services": "Teenused",
     "category:shop": "Ostmine",
+    "category:special": "",
     "category:sport": "",
     "category:tourism_attractions": "Turism",
     "category:tourism_services": "Turism",
+    "category:transport": "Transport",
     "category:transport_alternative": "Alternatiivne (jalgrattasõit, matkamine, ...)",
+    "category:transport_car": "",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Ühistransport",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "",
-    "category:leisure_sport_shopping": "Vaba aeg, sport ja ostmine",
-    "category:railway": "Raudtee",
-    "category:services": "Teenused",
-    "category:transport": "Transport",
-    "category:transport_pt": "Ühistransport"
+    "category:works": ""
 }
diff --git a/lang/fr.json b/lang/fr.json
index 2966570..93d167c 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "Équipements auto",
     "category:car_furniture": "Fournitures automobiles",
     "category:car_maxspeed": "Limites de vitesse",
+    "category:car_routes": "",
     "category:children": "Équipements pour enfants",
+    "category:coal": "",
     "category:communication": "Communication",
     "category:construction": "Constructions",
     "category:craft": "Artisanat",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "Équipements vélo",
     "category:cycle_routes": "Itinéraires vélo",
     "category:education": "Éducation",
+    "category:electric_power": "Énergie",
     "category:emergency": "Services d'urgence",
+    "category:energy": "",
     "category:financial": "Finance",
-    "category:gastro-smoking": "Restauration sans tabac",
     "category:gastro": "Restauration",
+    "category:gastro-smoking": "Restauration sans tabac",
     "category:health": "Santé",
     "category:hiking_routes": "Itinéraires pédestres",
     "category:historic": "Histoire",
     "category:index": "",
+    "category:infrastructure": "Infrastructures",
     "category:internet": "Internet",
     "category:leisure": "Loisirs",
+    "category:leisure_sport_shopping": "Loisirs",
+    "category:memorial": "",
     "category:military": "Militaire",
     "category:mtb-routes": "Itinéraires de VTT",
     "category:natural": "Éléments naturels",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Autres",
     "category:outdoor": "Activités de plein air",
     "category:phone": "Téléphone",
@@ -36,36 +45,34 @@
     "category:places_geo": "Lieux",
     "category:playgrounds": "Jeux pour enfants",
     "category:post": "",
-    "category:power": "Énergie",
     "category:pt": "",
-    "category:pt:stops": "Arrêts/Stops, Stations",
     "category:pt:routes": "Lignes",
+    "category:pt:stops": "Arrêts/Stops, Stations",
     "category:pt_amenities": "Équipements",
     "category:public": "Services Publics",
+    "category:railway": "Chemins de fer",
     "category:railway-electrification": "Puissance électrique ferroviaire",
     "category:railway-infrastructure": "Infrastructure ferroviaire",
+    "category:railway-maxspeed": "Limites de vitesse",
     "category:railway-routes": "Lignes ferroviaires",
     "category:religion": "Religion",
     "category:residential": "Zones résidentielles",
     "category:resources": "Extraction des ressources",
+    "category:services": "Services",
     "category:shop": "Magasins/Boutiques",
+    "category:special": "Catégories spéciales",
     "category:sport": "Sports",
     "category:tourism_attractions": "Tourisme",
     "category:tourism_services": "Tourisme",
+    "category:transport": "Transports",
     "category:transport_alternative": "Alternatif (Cyclisme, Randonnée, ...)",
+    "category:transport_car": "Transport automobile",
+    "category:transport_cycle": "Cyclisme",
+    "category:transport_pt": "Transports publics",
+    "category:transport_walk": "Marche à pied",
     "category:walk_amenities": "Équipements piétons",
     "category:waste": "Déchets/Recyclage",
     "category:water": "Hydrographie",
     "category:wikipedia": "Wikipédia",
-    "category:works": "Zones industrielles",
-    "category:infrastructure": "Infrastructures",
-    "category:leisure_sport_shopping": "Loisirs",
-    "category:railway": "Chemins de fer",
-    "category:services": "Services",
-    "category:special": "Catégories spéciales",
-    "category:transport": "Transports",
-    "category:transport_car": "Transport automobile",
-    "category:transport_cycle": "Cyclisme",
-    "category:transport_pt": "Transports publics",
-    "category:transport_walk": "Marche à pied"
+    "category:works": "Zones industrielles"
 }
diff --git a/lang/hu.json b/lang/hu.json
index 18aff4a..1595904 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -1,66 +1,78 @@
 {
-    "category:administrative": "Adminisztratív határok",
+    "category:administrative": "Közigazgatási határok",
     "category:agriculture": "Mezőgazdaság",
-    "category:alternative_amenities": "",
-    "category:alternative_routes": "",
-    "category:buildings": "",
-    "category:car_amenities": "",
-    "category:car_furniture": "",
-    "category:car_maxspeed": "",
-    "category:children": "",
+    "category:alternative_amenities": "Létesítmények",
+    "category:alternative_routes": "Útvonalak",
+    "category:buildings": "Épületek",
+    "category:car_amenities": "Létesítmények",
+    "category:car_furniture": "Jelzőtáblák",
+    "category:car_maxspeed": "Sebességkorlátozás",
+    "category:car_routes": "Főútvonalak",
+    "category:children": "Gyermekek",
+    "category:coal": "",
     "category:communication": "Kommunikácó",
-    "category:construction": "",
-    "category:craft": "",
+    "category:construction": "Építési terület",
+    "category:craft": "Műhelyek",
     "category:culture": "Kultúra",
-    "category:culture_religion": "Kultúra",
-    "category:cycle_amenities": "",
-    "category:cycle_routes": "",
-    "category:education": "",
-    "category:emergency": "",
-    "category:financial": "",
-    "category:gastro-smoking": "",
-    "category:gastro": "Gasztronómia",
-    "category:health": "",
-    "category:hiking_routes": "",
-    "category:historic": "Historikus",
-    "category:index": "",
-    "category:internet": "Internethozzáférés",
-    "category:leisure": "",
-    "category:military": "Katonai",
-    "category:mtb-routes": "",
+    "category:culture_religion": "Kultúra és vallás",
+    "category:cycle_amenities": "Kerékpáros létesítmények",
+    "category:cycle_routes": "Kerékpáros útvonalak",
+    "category:education": "Oktatás",
+    "category:electric_power": "Áramellátás",
+    "category:emergency": "Vészhelyzet",
+    "category:energy": "",
+    "category:financial": "Pénzügyek",
+    "category:gastro": "Vendéglátás",
+    "category:gastro-smoking": "Nem dohányzó vendéglátóhelyek",
+    "category:health": "Egészségügy",
+    "category:hiking_routes": "Turistautak",
+    "category:historic": "Történelmi objektumok",
+    "category:index": "Tartalom",
+    "category:infrastructure": "Infrastruktúra",
+    "category:internet": "Internetcsatlakozás",
+    "category:leisure": "Szabadidő",
+    "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás",
+    "category:memorial": "",
+    "category:military": "Katonai objektumok",
+    "category:mtb-routes": "Hegyikerékpáros útvonalak",
     "category:natural": "Természeti képződmények",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Egyéb",
-    "category:outdoor": "",
+    "category:outdoor": "Szabadtéri tevékenységek",
     "category:phone": "Telefon",
     "category:places": "Helyek",
     "category:places_geo": "Helyek",
-    "category:playgrounds": "",
+    "category:playgrounds": "Játszóterek",
     "category:post": "Posta",
-    "category:power": "Áramellátás",
-    "category:pt": "",
+    "category:pt": "Tömegközlekedési térkép",
+    "category:pt:routes": "Útvonalak",
     "category:pt:stops": "Megállók és állomások",
-    "category:pt:routes": "",
-    "category:pt_amenities": "",
-    "category:public": "",
-    "category:railway-electrification": "",
-    "category:railway-infrastructure": "",
-    "category:railway-routes": "",
+    "category:pt_amenities": "Létesítmények",
+    "category:public": "Közszolgáltatások",
+    "category:railway": "Vasút",
+    "category:railway-electrification": "Vasút villamosítottsága",
+    "category:railway-infrastructure": "Vasúti infrastruktúra",
+    "category:railway-maxspeed": "Sebességkorlátozás",
+    "category:railway-routes": "Vasútvonalak",
     "category:religion": "Vallás",
     "category:residential": "Lakóövezetek",
-    "category:resources": "",
+    "category:resources": "Bányászat",
+    "category:services": "Szolgáltatások",
     "category:shop": "Vásárlás",
+    "category:special": "Speciális",
     "category:sport": "Sport",
-    "category:tourism_attractions": "Túrizmus",
-    "category:tourism_services": "Túrizmus",
-    "category:transport_alternative": "Alternatív (Krékpár, Túra)",
-    "category:walk_amenities": "",
-    "category:waste": "",
-    "category:water": "",
-    "category:wikipedia": "",
-    "category:works": "",
-    "category:leisure_sport_shopping": "Szabadidő",
-    "category:railway": "Vasút",
-    "category:services": "Szolgáltatás",
+    "category:tourism_attractions": "Látnivalók",
+    "category:tourism_services": "Turisztikai szolgáltatások",
     "category:transport": "Közlekedés",
-    "category:transport_pt": "Tömegközlekedés"
+    "category:transport_alternative": "Alternatív (Kerékpár, Túra)",
+    "category:transport_car": "Autós közlekedés",
+    "category:transport_cycle": "Kerékpáros közlekedés",
+    "category:transport_pt": "Tömegközlekedés",
+    "category:transport_walk": "Gyalogos közlekedés",
+    "category:walk_amenities": "Gyalogos létesítmények",
+    "category:waste": "Hulladék",
+    "category:water": "Vizek",
+    "category:wikipedia": "Wikipédia",
+    "category:works": "Üzemek"
 }
diff --git a/lang/it.json b/lang/it.json
index d910d5c..7c62381 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "Infrastrutture",
     "category:car_furniture": "Dotazioni stradali",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Communicazioni",
     "category:construction": "Cantieri",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "Istruzione",
+    "category:electric_power": "Energia",
     "category:emergency": "Servizi d'emergenza",
+    "category:energy": "",
     "category:financial": "Finanze",
-    "category:gastro-smoking": "",
     "category:gastro": "Gastronomia",
+    "category:gastro-smoking": "",
     "category:health": "Sanità",
     "category:hiking_routes": "",
     "category:historic": "Storia",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "",
     "category:leisure": "Tempo libero",
+    "category:leisure_sport_shopping": "Tempo libero, sport e shopping",
+    "category:memorial": "",
     "category:military": "Militare",
     "category:mtb-routes": "",
     "category:natural": "Natura",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Altri",
     "category:outdoor": "",
     "category:phone": "",
@@ -36,32 +45,34 @@
     "category:places_geo": "Luoghi",
     "category:playgrounds": "",
     "category:post": "",
-    "category:power": "Energia",
     "category:pt": "",
-    "category:pt:stops": "Stazioni e fermate",
     "category:pt:routes": "",
+    "category:pt:stops": "Stazioni e fermate",
     "category:pt_amenities": "Infrastrutture",
     "category:public": "Servizi pubblici",
+    "category:railway": "Ferrovie",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Religione",
     "category:residential": "Aree residenziali",
     "category:resources": "Areee estrattive",
+    "category:services": "Servizi",
     "category:shop": "Acquisti",
+    "category:special": "",
     "category:sport": "Sport",
     "category:tourism_attractions": "Turismo",
     "category:tourism_services": "Turismo",
+    "category:transport": "Trasporti",
     "category:transport_alternative": "Alternativi (bicicletta, camminate, ...)",
+    "category:transport_car": "Trasporti individuali",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Trasporti pubblici",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "Smaltimento",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "Fabbriche",
-    "category:leisure_sport_shopping": "Tempo libero, sport e shopping",
-    "category:railway": "Ferrovie",
-    "category:services": "Servizi",
-    "category:transport": "Trasporti",
-    "category:transport_car": "Trasporti individuali",
-    "category:transport_pt": "Trasporti pubblici"
+    "category:works": "Fabbriche"
 }
diff --git a/lang/ja.json b/lang/ja.json
index bb9baa3..0e5e62f 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "生活環境",
     "category:car_furniture": "街路設置公共物",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "交流",
     "category:construction": "工事中",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "教育サービス",
+    "category:electric_power": "電力",
     "category:emergency": "緊急サービス",
+    "category:energy": "",
     "category:financial": "金融",
-    "category:gastro-smoking": "",
     "category:gastro": "食べ物",
+    "category:gastro-smoking": "",
     "category:health": "健康",
     "category:hiking_routes": "",
     "category:historic": "記念",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "インターネット接続",
     "category:leisure": "レジャー",
+    "category:leisure_sport_shopping": "レジャー",
+    "category:memorial": "",
     "category:military": "軍事",
     "category:mtb-routes": "",
     "category:natural": "自然地層",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "その他",
     "category:outdoor": "",
     "category:phone": "電話",
@@ -36,32 +45,34 @@
     "category:places_geo": "場所",
     "category:playgrounds": "",
     "category:post": "郵便",
-    "category:power": "電力",
     "category:pt": "",
-    "category:pt:stops": "停留所と駅",
     "category:pt:routes": "",
+    "category:pt:stops": "停留所と駅",
     "category:pt_amenities": "生活環境",
     "category:public": "公共サービス",
+    "category:railway": "鉄道",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "宗教",
     "category:residential": "住居エリア",
     "category:resources": "",
+    "category:services": "サービス",
     "category:shop": "ショッピング",
+    "category:special": "",
     "category:sport": "スポーツ",
     "category:tourism_attractions": "観光",
     "category:tourism_services": "観光",
+    "category:transport": "輸送",
     "category:transport_alternative": "その他交通 (サイクリング、ハイキング、...)",
+    "category:transport_car": "個人輸送機関",
+    "category:transport_cycle": "",
+    "category:transport_pt": "公共輸送",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "処理場",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "工場",
-    "category:leisure_sport_shopping": "レジャー",
-    "category:railway": "鉄道",
-    "category:services": "サービス",
-    "category:transport": "輸送",
-    "category:transport_car": "個人輸送機関",
-    "category:transport_pt": "公共輸送"
+    "category:works": "工場"
 }
diff --git a/lang/nl.json b/lang/nl.json
index beab190..8b1d6af 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "Voorzieningen",
     "category:car_furniture": "Straatmeubilair",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Communicatie",
     "category:construction": "Bouwterrein",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "Onderwijs",
+    "category:electric_power": "Stroomvoorziening",
     "category:emergency": "Hulpdiensten",
+    "category:energy": "",
     "category:financial": "Financieel",
-    "category:gastro-smoking": "",
     "category:gastro": "Gastronomie",
+    "category:gastro-smoking": "",
     "category:health": "Gezondheid",
     "category:hiking_routes": "",
     "category:historic": "Historisch",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "Internettoegang",
     "category:leisure": "Vrije tijd",
+    "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen",
+    "category:memorial": "",
     "category:military": "Militair",
     "category:mtb-routes": "",
     "category:natural": "Natuurlijke Formaties",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Andere",
     "category:outdoor": "",
     "category:phone": "Telefonie",
@@ -36,32 +45,34 @@
     "category:places_geo": "Plaatsen",
     "category:playgrounds": "",
     "category:post": "Post",
-    "category:power": "Stroomvoorziening",
     "category:pt": "",
-    "category:pt:stops": "Haltes en Stations",
     "category:pt:routes": "",
+    "category:pt:stops": "Haltes en Stations",
     "category:pt_amenities": "Voorzieningen",
     "category:public": "Openbare diensten",
+    "category:railway": "Spoorwegen",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Religie",
     "category:residential": "Woongebieden",
     "category:resources": "Grondstoffenwinning",
+    "category:services": "Dienstverlening",
     "category:shop": "Winkelen",
+    "category:special": "",
     "category:sport": "Sport",
     "category:tourism_attractions": "Toerisme",
     "category:tourism_services": "Toerisme",
+    "category:transport": "Vervoer",
     "category:transport_alternative": "Alternatief (Fiets, Wandel, ...)",
+    "category:transport_car": "Gemotoriseerd individueel verkeer",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Openbaar vervoer",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "Afvalverwijdering",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "Fabrieken",
-    "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen",
-    "category:railway": "Spoorwegen",
-    "category:services": "Dienstverlening",
-    "category:transport": "Vervoer",
-    "category:transport_car": "Gemotoriseerd individueel verkeer",
-    "category:transport_pt": "Openbaar vervoer"
+    "category:works": "Fabrieken"
 }
diff --git a/lang/pl.json b/lang/pl.json
index e4ef278..aced0df 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "",
     "category:car_furniture": "Elementy drogowe",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "",
     "category:construction": "",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "Edukacyjne",
+    "category:electric_power": "",
     "category:emergency": "",
+    "category:energy": "",
     "category:financial": "Finasowe",
-    "category:gastro-smoking": "",
     "category:gastro": "Gastronomia",
+    "category:gastro-smoking": "",
     "category:health": "Zdrowie",
     "category:hiking_routes": "",
     "category:historic": "Miejsca Historyczne",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "",
     "category:leisure": "",
+    "category:leisure_sport_shopping": "Wypoczynek, Sport i Zakupy",
+    "category:memorial": "",
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "",
     "category:outdoor": "",
     "category:phone": "",
@@ -36,31 +45,34 @@
     "category:places_geo": "Miejsca",
     "category:playgrounds": "",
     "category:post": "",
-    "category:power": "",
     "category:pt": "",
-    "category:pt:stops": "Przystanki i Stacje",
     "category:pt:routes": "",
+    "category:pt:stops": "Przystanki i Stacje",
     "category:pt_amenities": "",
     "category:public": "",
+    "category:railway": "",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "",
     "category:residential": "",
     "category:resources": "",
+    "category:services": "Usługi",
     "category:shop": "Zakupy",
+    "category:special": "",
     "category:sport": "",
     "category:tourism_attractions": "Turystyka",
     "category:tourism_services": "Turystyka",
+    "category:transport": "Transport",
     "category:transport_alternative": "",
+    "category:transport_car": "Transport Indywidualny",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Transport Publiczny",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "",
-    "category:leisure_sport_shopping": "Wypoczynek, Sport i Zakupy",
-    "category:services": "Usługi",
-    "category:transport": "Transport",
-    "category:transport_car": "Transport Indywidualny",
-    "category:transport_pt": "Transport Publiczny"
+    "category:works": ""
 }
diff --git a/lang/pt-br.json b/lang/pt-br.json
index 60568c0..10476d8 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -7,8 +7,9 @@
     "category:car_amenities": "Equipamentos",
     "category:car_furniture": "Mobiliário urbano",
     "category:car_maxspeed": "Velocidade máxima",
-    "category:car_routes": "Rota rodoviária",
+    "category:car_routes": "Rotas rodoviárias",
     "category:children": "Equipamentos infantis",
+    "category:coal": "",
     "category:communication": "Comunicação",
     "category:construction": "Terrenos vazios e obras",
     "category:craft": "Ofícios",
@@ -17,19 +18,26 @@
     "category:cycle_amenities": "Equipamentos",
     "category:cycle_routes": "Ciclorrotas",
     "category:education": "Educação",
+    "category:electric_power": "Energia",
     "category:emergency": "Emergência",
+    "category:energy": "",
     "category:financial": "Finanças",
-    "category:gastro-smoking": "Gastronomia sem fumo",
     "category:gastro": "Gastronomia",
+    "category:gastro-smoking": "Gastronomia sem fumo",
     "category:health": "Saúde e assistência",
     "category:hiking_routes": "Rotas de caminhada",
     "category:historic": "Histórico",
     "category:index": "Índice",
+    "category:infrastructure": "Infraestrutura",
     "category:internet": "Acesso à Internet",
     "category:leisure": "Lazer",
+    "category:leisure_sport_shopping": "Lazer, esportes e compras",
+    "category:memorial": "",
     "category:military": "Militar",
     "category:mtb-routes": "Rotas mountain bike",
     "category:natural": "Formações naturais",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Outros",
     "category:outdoor": "Atividades ao ar livre",
     "category:phone": "Telefone",
@@ -37,36 +45,34 @@
     "category:places_geo": "Lugares",
     "category:playgrounds": "Parquinhos",
     "category:post": "Correios",
-    "category:power": "Energia",
     "category:pt": "Mapa de transporte público",
-    "category:pt:stops": "Paradas e estações",
     "category:pt:routes": "Rotas",
+    "category:pt:stops": "Paradas e estações",
     "category:pt_amenities": "Equipamentos",
     "category:public": "Serviços públicos",
+    "category:railway": "Ferrovia",
     "category:railway-electrification": "Eletrificação ferroviária",
     "category:railway-infrastructure": "Infraestrutura ferroviária",
+    "category:railway-maxspeed": "Velocidade máxima",
     "category:railway-routes": "Rotas ferroviárias",
     "category:religion": "Religião",
     "category:residential": "Áreas residenciais",
     "category:resources": "Extração de recursos",
+    "category:services": "Prestação de serviços",
     "category:shop": "Compras",
+    "category:special": "Especial",
     "category:sport": "Esportes",
     "category:tourism_attractions": "Turismo",
     "category:tourism_services": "Serviços de turismo",
+    "category:transport": "Mobilidade",
     "category:transport_alternative": "Transporte alternativo",
+    "category:transport_car": "Tráfego individual",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transporte público",
+    "category:transport_walk": "Pedestre",
     "category:walk_amenities": "Equipamentos",
     "category:waste": "Lixo",
     "category:water": "Hidrografia",
     "category:wikipedia": "Wikipédia",
-    "category:works": "Fábricas",
-    "category:infrastructure": "Infraestrutura",
-    "category:leisure_sport_shopping": "Lazer, esportes e compras",
-    "category:railway": "Ferrovia",
-    "category:services": "Prestação de serviços",
-    "category:special": "Especial",
-    "category:transport": "Mobilidade",
-    "category:transport_car": "Tráfego individual",
-    "category:transport_cycle": "Ciclismo",
-    "category:transport_pt": "Transporte público",
-    "category:transport_walk": "Pedestre"
+    "category:works": "Fábricas"
 }
diff --git a/lang/pt.json b/lang/pt.json
index 6b83f42..bc57099 100644
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "",
     "category:car_furniture": "Mobiliário urbano",
     "category:car_maxspeed": "Velocidade máxima",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Comunicação",
     "category:construction": "Locais de construção",
     "category:craft": "Artesanato",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "Ciclovias",
     "category:education": "Educação",
+    "category:electric_power": "Eletricidade",
     "category:emergency": "Emergência",
+    "category:energy": "",
     "category:financial": "Finanças",
-    "category:gastro-smoking": "Restauração livre de tabaco",
     "category:gastro": "Restauração",
+    "category:gastro-smoking": "Restauração livre de tabaco",
     "category:health": "Saúde",
     "category:hiking_routes": "Rotas de caminhada",
     "category:historic": "Histórico",
     "category:index": "",
+    "category:infrastructure": "Infraestrutura",
     "category:internet": "Acesso à Internet",
     "category:leisure": "Lazer",
+    "category:leisure_sport_shopping": "Lazer, desporto e compras",
+    "category:memorial": "",
     "category:military": "Militar",
     "category:mtb-routes": "",
     "category:natural": "Formações naturais",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Outros",
     "category:outdoor": "",
     "category:phone": "Telefone",
@@ -36,36 +45,34 @@
     "category:places_geo": "Lugares",
     "category:playgrounds": "Parques infantis",
     "category:post": "Correios",
-    "category:power": "Eletricidade",
     "category:pt": "",
-    "category:pt:stops": "",
     "category:pt:routes": "Rotas",
+    "category:pt:stops": "",
     "category:pt_amenities": "",
     "category:public": "Serviços públicos",
+    "category:railway": "Linhas ferroviárias",
     "category:railway-electrification": "Eletrificação ferroviária",
     "category:railway-infrastructure": "Infraestrutura ferroviária",
+    "category:railway-maxspeed": "Velocidade máxima",
     "category:railway-routes": "",
     "category:religion": "Religião",
     "category:residential": "Áreas residenciais",
     "category:resources": "Extração de recursos",
+    "category:services": "Serviços",
     "category:shop": "Compras",
+    "category:special": "Especial",
     "category:sport": "Desporto",
     "category:tourism_attractions": "Turismo",
     "category:tourism_services": "Turismo",
+    "category:transport": "Transportes",
     "category:transport_alternative": "",
+    "category:transport_car": "Transporte individual",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transportes públicos",
+    "category:transport_walk": "Pedestre",
     "category:walk_amenities": "",
     "category:waste": "Lixo",
     "category:water": "Massas de água",
     "category:wikipedia": "Wikipédia",
-    "category:works": "Fábricas",
-    "category:infrastructure": "Infraestrutura",
-    "category:leisure_sport_shopping": "Lazer, desporto e compras",
-    "category:railway": "Linhas ferroviárias",
-    "category:services": "Serviços",
-    "category:special": "Especial",
-    "category:transport": "Transportes",
-    "category:transport_car": "Transporte individual",
-    "category:transport_cycle": "Ciclismo",
-    "category:transport_pt": "Transportes públicos",
-    "category:transport_walk": "Pedestre"
+    "category:works": "Fábricas"
 }
diff --git a/lang/ro.json b/lang/ro.json
index 543a739..dbc1e61 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Comunicatii",
     "category:construction": "",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "Servicii educatie",
+    "category:electric_power": "Energie",
     "category:emergency": "Servicii urgenta",
+    "category:energy": "",
     "category:financial": "Financiar",
-    "category:gastro-smoking": "",
     "category:gastro": "Gastronomie",
+    "category:gastro-smoking": "",
     "category:health": "Sanatate",
     "category:hiking_routes": "",
     "category:historic": "Istoric",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "Acces internet",
     "category:leisure": "Timp liber",
+    "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi",
+    "category:memorial": "",
     "category:military": "Militar",
     "category:mtb-routes": "",
     "category:natural": "",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Altele",
     "category:outdoor": "",
     "category:phone": "Telefon",
@@ -36,31 +45,34 @@
     "category:places_geo": "Locuri",
     "category:playgrounds": "Loc de joaca",
     "category:post": "",
-    "category:power": "Energie",
     "category:pt": "",
-    "category:pt:stops": "",
     "category:pt:routes": "",
+    "category:pt:stops": "",
     "category:pt_amenities": "",
     "category:public": "Servicii publice",
+    "category:railway": "",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Religie",
     "category:residential": "Zona rezidentiala",
     "category:resources": "",
+    "category:services": "Servicii",
     "category:shop": "Cumpărături",
+    "category:special": "",
     "category:sport": "",
     "category:tourism_attractions": "Turism",
     "category:tourism_services": "Turism",
+    "category:transport": "Transport",
     "category:transport_alternative": "Alternativ(Bicicleta,Drumetii)",
+    "category:transport_car": "Trafic individual",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Transport public",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "",
-    "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi",
-    "category:services": "Servicii",
-    "category:transport": "Transport",
-    "category:transport_car": "Trafic individual",
-    "category:transport_pt": "Transport public"
+    "category:works": ""
 }
diff --git a/lang/ru.json b/lang/ru.json
index 3f308a2..0237ae3 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "Обслуживание транспорта",
     "category:car_furniture": "Элементы дороги",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Услуги связи",
     "category:construction": "Места строительства",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "Образование",
+    "category:electric_power": "Энергетика",
     "category:emergency": "Экстренные службы",
+    "category:energy": "",
     "category:financial": "Финансы",
-    "category:gastro-smoking": "",
     "category:gastro": "Общепит",
+    "category:gastro-smoking": "",
     "category:health": "Медицина",
     "category:hiking_routes": "",
     "category:historic": "Историческое",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "",
     "category:leisure": "Досуг",
+    "category:leisure_sport_shopping": "Досуг",
+    "category:memorial": "",
     "category:military": "Вооружённые силы",
     "category:mtb-routes": "",
     "category:natural": "Природные образования",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Прочее",
     "category:outdoor": "",
     "category:phone": "",
@@ -36,32 +45,34 @@
     "category:places_geo": "Места",
     "category:playgrounds": "",
     "category:post": "",
-    "category:power": "Энергетика",
     "category:pt": "",
-    "category:pt:stops": "Остановки и станции",
     "category:pt:routes": "",
+    "category:pt:stops": "Остановки и станции",
     "category:pt_amenities": "Транспортные принадлежности",
     "category:public": "Общественные места",
+    "category:railway": "Железные дороги",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Религия",
     "category:residential": "Жилые районы",
     "category:resources": "Добыча ресурсов",
+    "category:services": "Услуги",
     "category:shop": "Покупки",
+    "category:special": "",
     "category:sport": "Спорт",
     "category:tourism_attractions": "Туризм",
     "category:tourism_services": "Туризм",
+    "category:transport": "Транспорт",
     "category:transport_alternative": "Альтернативное передвижение (Велоспорт, Пешие прогулки, ...)",
+    "category:transport_car": "Частный транспорт",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Общественный транспорт",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "Переработка отходов",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "Промышленность",
-    "category:leisure_sport_shopping": "Досуг",
-    "category:railway": "Железные дороги",
-    "category:services": "Услуги",
-    "category:transport": "Транспорт",
-    "category:transport_car": "Частный транспорт",
-    "category:transport_pt": "Общественный транспорт"
+    "category:works": "Промышленность"
 }
diff --git a/lang/template.json b/lang/template.json
index 56c2d2c..6f83241 100644
--- a/lang/template.json
+++ b/lang/template.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "",
     "category:construction": "",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "",
+    "category:electric_power": "",
     "category:emergency": "",
+    "category:energy": "",
     "category:financial": "",
-    "category:gastro-smoking": "",
     "category:gastro": "",
+    "category:gastro-smoking": "",
     "category:health": "",
     "category:hiking_routes": "",
     "category:historic": "",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "",
     "category:leisure": "",
+    "category:leisure_sport_shopping": "",
+    "category:memorial": "",
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "",
     "category:outdoor": "",
     "category:phone": "",
@@ -36,23 +45,31 @@
     "category:places_geo": "",
     "category:playgrounds": "",
     "category:post": "",
-    "category:power": "",
     "category:pt": "",
-    "category:pt:stops": "",
     "category:pt:routes": "",
+    "category:pt:stops": "",
     "category:pt_amenities": "",
     "category:public": "",
+    "category:railway": "",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "",
     "category:residential": "",
     "category:resources": "",
+    "category:services": "",
     "category:shop": "",
+    "category:special": "",
     "category:sport": "",
     "category:tourism_attractions": "",
     "category:tourism_services": "",
+    "category:transport": "",
     "category:transport_alternative": "",
+    "category:transport_car": "",
+    "category:transport_cycle": "",
+    "category:transport_pt": "",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "",
     "category:water": "",
diff --git a/lang/uk.json b/lang/uk.json
index 8ac916e..7c67359 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -7,7 +7,9 @@
     "category:car_amenities": "Amenities",
     "category:car_furniture": "Street Furniture",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
+    "category:coal": "",
     "category:communication": "Телекомунікації",
     "category:construction": "",
     "category:craft": "",
@@ -16,19 +18,26 @@
     "category:cycle_amenities": "",
     "category:cycle_routes": "",
     "category:education": "Освіта",
+    "category:electric_power": "",
     "category:emergency": "Швидка допомога",
+    "category:energy": "",
     "category:financial": "Фінанси",
-    "category:gastro-smoking": "",
     "category:gastro": "Гастрономія",
+    "category:gastro-smoking": "",
     "category:health": "Здоров'я",
     "category:hiking_routes": "",
     "category:historic": "Історія",
     "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "",
     "category:leisure": "Дозвілля",
+    "category:leisure_sport_shopping": "Дозвілля",
+    "category:memorial": "",
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "Природне середовище",
+    "category:network": "",
+    "category:oil_gas": "",
     "category:other": "Інше",
     "category:outdoor": "",
     "category:phone": "",
@@ -36,31 +45,34 @@
     "category:places_geo": "Місцевість",
     "category:playgrounds": "Дитячий майданчик",
     "category:post": "",
-    "category:power": "",
     "category:pt": "",
-    "category:pt:stops": "Зупинки та станції",
     "category:pt:routes": "",
+    "category:pt:stops": "Зупинки та станції",
     "category:pt_amenities": "Amenities",
     "category:public": "Громадські місця",
+    "category:railway": "",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Релігія",
     "category:residential": "Житлова зона",
     "category:resources": "",
+    "category:services": "Послуги",
     "category:shop": "Торгівля",
+    "category:special": "",
     "category:sport": "Спорт. Інше.",
     "category:tourism_attractions": "Туризм",
     "category:tourism_services": "Туризм",
+    "category:transport": "Транспорт",
     "category:transport_alternative": "Інші (Велосипедні, піші, ...)",
+    "category:transport_car": "Приватний транспорт",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Громадський транспорт",
+    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": "",
-    "category:leisure_sport_shopping": "Дозвілля",
-    "category:services": "Послуги",
-    "category:transport": "Транспорт",
-    "category:transport_car": "Приватний транспорт",
-    "category:transport_pt": "Громадський транспорт"
+    "category:works": ""
 }
diff --git a/leisure.json b/leisure.json
index 2dca403..7a01806 100644
--- a/leisure.json
+++ b/leisure.json
@@ -7,6 +7,7 @@
         "el": "Αναψυχή",
         "en": "Leisure",
         "fr": "Loisirs",
+        "hu": "Szabadidő",
         "it": "Tempo libero",
         "ja": "レジャー",
         "nl": "Vrije tijd",
diff --git a/memorial.json b/memorial.json
new file mode 100644
index 0000000..117785c
--- /dev/null
+++ b/memorial.json
@@ -0,0 +1,67 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Denkmäler",
+        "en": "Memorials"
+    },
+    "query": {
+        "11": [
+            "(",
+            "node[historic~\"^(monument)$\"];",
+            "way[historic~\"^(monument)$\"];",
+            "relation[historic~\"^(monument)$\"];",
+            ")"
+        ],
+        "14": [
+            "(",
+            "node[historic~\"^(memorial|monument)$\"];",
+            "way[historic~\"^(memorial|monument)$\"];",
+            "relation[historic~\"^(memorial|monument)$\"];",
+            ")"
+        ]
+    },
+    "feature": {
+        "pre": [
+            "{% set value = tags.historic %}",
+            "{% if tags.historic == 'memorial' and tags.memorial %}",
+            "  {% set value = tags.historic ~ ' memorial=' ~ tags.memorial %}",
+            "{% elseif tags.historic == 'memorial' and attribute(tags, 'memorial:type') %}",
+            "  {% set value = tags.historic ~ ' memorial=' ~ attribute(tags, 'memorial:type') %}",
+            "{% endif %}"
+        ],
+        "description": "{{ tagTransList('historic', value) }}",
+        "markerSign": "{{ const[value].sign|raw }}"
+    },
+    "info": [
+        "<table>",
+        "{% for value, data in const %}",
+        "{% if data.zoom <= map.zoom %}",
+        "  <tr>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
+        "    <td>{{ tagTrans('historic', value) }}</td>",
+        "  </tr>",
+        "{% endif %}",
+        "{% endfor %}",
+        "{% if 14 <= map.zoom %}",
+        "  <tr>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'></div></td>",
+        "    <td>{{ trans('other') }}</td>",
+        "  </tr>",
+        "{% endif %}",
+        "</table>"
+    ],
+    "const": {
+        "memorial": {
+            "sign": "<span  style='position: relative; top: -2px;'><img src='maki:monument?size=11'></span>",
+            "zoom": 14
+        },
+        "memorial memorial=plaque": {
+            "sign": "",
+            "zoom": 14
+        },
+        "monument": {
+            "sign": "<img src='maki:monument?size=15'>",
+            "zoom": 11
+        }
+    }
+}
diff --git a/military.json b/military.json
index 602868c..4c4eade 100644
--- a/military.json
+++ b/military.json
@@ -7,7 +7,7 @@
         "el": "Στρατιωτικό",
         "en": "Military",
         "fr": "Militaire",
-        "hu": "Katonai",
+        "hu": "Katonai objektumok",
         "it": "Militare",
         "ja": "軍事",
         "nl": "Militair",
diff --git a/mtb-routes.json b/mtb-routes.json
index 2bca75e..02d2c71 100644
--- a/mtb-routes.json
+++ b/mtb-routes.json
@@ -3,6 +3,7 @@
     "name": {
         "en": "Mountain bike routes",
         "fr": "Itinéraires de VTT",
+        "hu": "Hegyikerékpáros útvonalak",
         "pt-br": "Rotas mountain bike"
     },
     "query": {
@@ -43,7 +44,7 @@
             "color": "#007fff",
             "width": 4,
             "opacity": 1,
-            "text": "{{ refs|join('  ') }}             ",
+            "text": "{{ refs|join(' · ') }}             ",
             "textRepeat": "1",
             "textOffset": "12",
             "textFontWeight": "bold"
diff --git a/oil_gas.json b/oil_gas.json
new file mode 100644
index 0000000..96aa126
--- /dev/null
+++ b/oil_gas.json
@@ -0,0 +1,62 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Erdöl und Erdgas",
+        "en": "Petroleum and natural gas"
+    },
+    "query": {
+        "11": [
+            "(",
+            "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "node[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+            "way[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+            "relation[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+            "way[waterway=offshore_field];",
+            "relation[waterway=offshore_field];",
+            "node[man_made~\"^(offshore_platform)$\"];",
+            "way[man_made~\"^(offshore_platform)$\"];",
+            "relation[man_made~\"^(offshore_platform)$\"];",
+            "node[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            "way[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            "relation[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            ")"
+        ],
+        "13": [
+          "(",
+            "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "node[landuse=industrial][industrial~\"^(|.*;)(oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+            "way[landuse=industrial][industrial~\"^(|.*;)(oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+            "relation[landuse=industrial][industrial~\"^(|.*;)(oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+            "way[waterway=offshore_field];",
+            "relation[waterway=offshore_field];",
+            "node[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)$\"];",
+            "node[man_made~\"^(storage_tank)$\"][contents~\"^(oil|gas|lng|cng|multiphase)$\"];",
+            "way[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)$\"];",
+            "way[man_made~\"^(storage_tank)$\"][contents~\"^(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "relation[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)(|;.*)$\"];",
+            "relation[man_made~\"^(storage_tank)$\"][contents~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "node[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            "way[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            "relation[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            ")"
+        ]
+    },
+    "feature": {
+        "description": [
+            "{% if tags.man_made == 'pipeline' %}",
+            "{{ tagTrans('man_made', 'pipeline') }} ({{ tagTrans('substance', tags.substance) }})",
+            "{% elseif tags.man_made %}",
+            "{{ tagTrans('man_made', tags.man_made) }}",
+            "{% elseif tags.power == 'plant' %}",
+            "{{ tagTrans('power', 'plant') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
+            "{% elseif tags.waterway == 'offshore_field' %}",
+            "{{ tagTrans('waterway', tags.waterway) }}",
+            "{% elseif tags.landuse == 'industrial' %}",
+            "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})",
+            "{% endif %}"
+        ],
+        "markerSymbol": null
+    }
+}
diff --git a/outdoor.json b/outdoor.json
index fdf2225..eb3c290 100644
--- a/outdoor.json
+++ b/outdoor.json
@@ -4,6 +4,7 @@
         "de": "Freiluftaktivitäten",
         "en": "Outdoor activities",
         "fr": "Activités de plein air",
+        "hu": "Szabadtéri tevékenységek",
         "pt-br": "Atividades ao ar livre"
     },
     "subCategories": [
diff --git a/playgrounds.json b/playgrounds.json
index 789cf3e..84bc871 100644
--- a/playgrounds.json
+++ b/playgrounds.json
@@ -6,6 +6,7 @@
         "en": "Playground",
         "et": "Mänguväljak",
         "fr": "Jeux pour enfants",
+        "hu": "Játszóterek",
         "pt": "Parques infantis",
         "pt-br": "Parquinhos",
         "ro": "Loc de joaca",
diff --git a/popupBody.html b/popupBody.html
index ffa09d2..63b8317 100644
--- a/popupBody.html
+++ b/popupBody.html
@@ -91,8 +91,11 @@
   <i class="fa fa-money" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('payment') }}:</span>
   <span class='value'>
+    {% set i = 0 %}
     {% for k, tag in payment %}
-    {% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
+    {%- if i > 0 %},{% endif %}
+    <span title="{{ tagTrans(k, tags[tag]) }}">{% if tags[tag] == 'no' %}<s>{{ keyTrans(tag, { default: k }) }}</s>{% else %}{{ keyTrans(tag, { default: k }) }}{% endif -%}</span>
+    {% set i = i + 1 -%}
     {% endfor %}
   </span>
 </li>
diff --git a/pt.json b/pt.json
index 42c56e7..46451cf 100644
--- a/pt.json
+++ b/pt.json
@@ -3,6 +3,7 @@
     "name": {
         "de": "ÖV Karte",
         "en": "Public transport map",
+        "hu": "Tömegközlekedési térkép",
         "pt-br": "Mapa de transporte público"
     },
     "query": {
@@ -41,6 +42,7 @@
                 "de": "Routen",
                 "en": "Routes",
                 "fr": "Lignes",
+                "hu": "Útvonalak",
                 "pt": "Rotas",
                 "pt-br": "Rotas"
             }
@@ -58,7 +60,7 @@
             "<h4>Stops</h4><ul>",
             "{% for member in members %}",
             "{% if member.tags.highway == 'bus_stop' or member.tags.amenity == 'bus_station' or member.tags.amenity == 'ferry_terminal' or member.tags.railway == 'tram_stop' or member.tags.railway == 'halt' or member.tags.railway == 'station' or member.tags.aerialway == 'station' or member.tags.public_transport == 'stop_position' or member.role|slice(-4) == 'stop' %}",
-            "<li data-object='{{ member.id }}' data-sublayer='member'><b>{{ member.tags.name|default(member.id) }}</li>",
+            "<li data-object='{{ member.id }}' data-sublayer='member'><b>{% if member.tags %}{{ member.tags.name|default(trans('unknown')) }}{% else %}<i>{{ trans('loading') }}</i>{% endif %}</li>",
             "{% endif %}",
             "{% endfor %}",
             "</ul>"
@@ -120,13 +122,13 @@
         "listStopsMarkerSign": null,
         "listStopsMarkerSymbol": "{{ markerCircle({ width: 5, color: color, fillOpacity: '1', radius: 3 })|raw }}",
         "listStopsExclude": "{{ not isStop or stopCount == 0 }}",
-        "listStopsTitle": "{{ tags.name|default(stopName)|default(id) }}",
-        "listStopsDescription": "{{ refs|join(' ') }}",
+        "listStopsTitle": "{% if tags %}{{ tags.name|default(stopName)|default(trans('unknown')) }}{% else %}<li>{{ trans('loading') }}</li>{% endif %}",
+        "listStopsDescription": "{{ refs|join(' · ') }}",
         "listRoutesExclude": "true",
         "style:way": {
             "width": "3",
             "color": "{{ color|default('#ff0000') }}",
-            "text": "{{ refs|join('  ') }}             ",
+            "text": "{{ refs|join(' · ') }}             ",
             "textRepeat": "1",
             "textOffset": "12",
             "textFontWeight": "bold"
diff --git a/pt_amenities.json b/pt_amenities.json
index b5b5127..7d8d921 100644
--- a/pt_amenities.json
+++ b/pt_amenities.json
@@ -6,6 +6,7 @@
         "de": "Einrichtungen",
         "en": "Amenities",
         "fr": "Équipements",
+        "hu": "Létesítmények",
         "it": "Infrastrutture",
         "ja": "生活環境",
         "nl": "Voorzieningen",
diff --git a/public.json b/public.json
index 45ea203..cf28f62 100644
--- a/public.json
+++ b/public.json
@@ -8,6 +8,7 @@
         "en": "Public Services",
         "et": "Kommunaalteenused",
         "fr": "Services Publics",
+        "hu": "Közszolgáltatások",
         "it": "Servizi pubblici",
         "ja": "公共サービス",
         "nl": "Openbare diensten",
diff --git a/railway-electrification.json b/railway-electrification.json
index 3784a23..f54ba20 100644
--- a/railway-electrification.json
+++ b/railway-electrification.json
@@ -4,6 +4,7 @@
         "de": "Eisenbahn Elektrifizierung",
         "en": "Railway electrification",
         "fr": "Puissance électrique ferroviaire",
+        "hu": "Vasút villamosítottsága",
         "pt": "Eletrificação ferroviária",
         "pt-br": "Eletrificação ferroviária"
     },
diff --git a/railway-infrastructure.json b/railway-infrastructure.json
index 24cd53d..9381048 100644
--- a/railway-infrastructure.json
+++ b/railway-infrastructure.json
@@ -4,6 +4,7 @@
         "de": "Eisenbahn Infrastruktur",
         "en": "Railway infrastructure",
         "fr": "Infrastructure ferroviaire",
+        "hu": "Vasúti infrastruktúra",
         "pt": "Infraestrutura ferroviária",
         "pt-br": "Infraestrutura ferroviária"
     },
diff --git a/railway-maxspeed.json b/railway-maxspeed.json
new file mode 100644
index 0000000..10fb8a4
--- /dev/null
+++ b/railway-maxspeed.json
@@ -0,0 +1,117 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Eisenbahn Höchstgeschwindigkeiten",
+        "en": "Railway Maxspeed",
+        "fr": "Limites de vitesse",
+        "hu": "Sebességkorlátozás",
+        "pt": "Velocidade máxima",
+        "pt-br": "Velocidade máxima"
+    },
+    "query": {
+        "11": "way[railway=rail][railway!~'^(platform|abandoned|disused|station|proposed|subway_entrance)$'][usage~'^(main|branch)$'];",
+        "14": "way[railway][railway!~'^(platform|abandoned|disused|station|proposed|subway_entrance)$'];"
+    },
+    "feature": {
+        "pre": [
+            "{% if tags.maxspeed is not defined %}",
+            "{% set maxspeedKmh = null %}",
+            "{% set maxspeed = null %}",
+            "{% set unit = null %}",
+            "{% else %}",
+            "",
+            "{% if tags.maxspeed|matches(\"^[0-9]+$\") %}",
+            "{% set maxspeedKmh = tags.maxspeed %}",
+            "{% set maxspeed = tags.maxspeed %}",
+            "{% set unit = \"km/h\" %}",
+            "{% endif %}",
+            "",
+            "",
+            "{% set m = tags.maxspeed|matches(\"(^[0-9]+) mph$\") %}",
+            "{% if m %}",
+            "{% set maxspeedKmh = m[1] * 1.60934 %}",
+            "{% set maxspeed = m[1] %}",
+            "{% set unit = \"mph\" %}",
+            "{% endif %}",
+            "",
+            "{% endif %}",
+            "",
+            "{% if not maxspeedKmh %}",
+            "{% set color = \"#404040\" %}",
+            "{% else %}",
+            "{% set color = colorInterpolate(const.colorMap, (maxspeedKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}",
+            "{% endif %}"
+        ],
+        "description": [
+            "{% if maxspeed %}",
+            "<span style='color: {{ color }}'>{{ maxspeed }} {{ unit }}</span>",
+            "{% elseif tags.maxspeed %}",
+            "{{ tags.maxspeed }}",
+            "{% else %}",
+            "{{ trans('unknown') }}",
+            "{% endif %}"
+        ],
+        "markerSymbol": null,
+        "listMarkerSymbol": "line",
+        "style": {
+            "width": "3",
+            "color": "{{ color }}",
+            "text": "{{ maxspeed }}          ",
+            "textRepeat": "1",
+            "textFontWeight": "bold"
+        }
+    },
+    "const": {
+        "colorMap": [
+            "#00af00",
+            "#ff7f00",
+            "#ff0000",
+            "#af00af"
+        ],
+        "highestColorSpeed": 300,
+        "offsetColorSpeed": 20
+    },
+    "info": [
+        "<div style='display: inline-block'>",
+        "<table>",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({}))|raw }}</td>",
+        "    <td colspan>{{ trans('unknown') }}</td>",
+        "  </tr>",
+        "{% for i in range(25, 280, 25) %}",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({ \"maxspeed\": i }))|raw }}</td>",
+        "    <td>{{ i }}km/h</td>",
+        "  </tr>",
+        "{% endfor %}",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({ \"maxspeed\": 300 }))|raw }}</td>",
+        "    <td>≥300km/h</td>",
+        "  </tr>",
+        "</table>",
+        "</div>",
+        "",
+        "<div style='display: inline-block'>",
+        "<table>",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({}))|raw }}</td>",
+        "    <td colspan>{{ trans('unknown') }}</td>",
+        "  </tr>",
+        "{% for i in range(15, 150, 15) %}",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({ \"maxspeed\": (i * 1.60934)|round }))|raw }}</td>",
+        "    <td>{{ i }}mph</td>",
+        "  </tr>",
+        "{% endfor %}",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({ \"maxspeed\": (175 * 1.60934)|round }))|raw }}</td>",
+        "    <td>175mph</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({ \"maxspeed\": (200 * 1.60934)|round }))|raw }}</td>",
+        "    <td>≥200mph</td>",
+        "  </tr>",
+        "</table>",
+        "</div>"
+    ]
+}
diff --git a/railway-routes.json b/railway-routes.json
index ff20182..f06a1d3 100644
--- a/railway-routes.json
+++ b/railway-routes.json
@@ -3,6 +3,7 @@
     "name": {
         "en": "Railway Routes",
         "fr": "Lignes ferroviaires",
+        "hu": "Vasútvonalak",
         "pt-br": "Rotas ferroviárias"
     },
     "query": {
@@ -50,7 +51,7 @@
             "color": "{{ color }}",
             "width": 4,
             "opacity": 1,
-            "text": "{{ refs|join('  ') }}             ",
+            "text": "{{ refs|join(' · ') }}             ",
             "textRepeat": "1",
             "textOffset": "12",
             "textFontWeight": "bold"
diff --git a/religion.json b/religion.json
index 967b59e..ebdc2b6 100644
--- a/religion.json
+++ b/religion.json
@@ -27,6 +27,18 @@
             "way[landuse~\"^(cemetery)$\"];",
             "relation[landuse~\"^(cemetery)$\"];",
             ")"
+        ],
+        "14": [
+            "(",
+            "node[amenity~\"^(place_of_worship|grave_yard|crematorium)$\"];",
+            "way[amenity~\"^(place_of_worship|grave_yard|crematorium)$\"];",
+            "relation[amenity~\"^(place_of_worship|grave_yard|crematorium)$\"];",
+            "way[landuse~\"^(cemetery)$\"];",
+            "relation[landuse~\"^(cemetery)$\"];",
+            "node[historic~\"^wayside_(cross|shrine|chapel)$\"];",
+            "way[historic~\"^wayside_(cross|shrine|chapel)$\"];",
+            "relation[historic~\"^wayside_(cross|shrine|chapel)$\"];",
+            ")"
         ]
     },
     "feature": {
@@ -34,6 +46,9 @@
             "{% if tags.landuse == 'cemetery' %}",
             "{% set key = 'landuse' %}",
             "{% set value = tags.landuse %}",
+            "{% elseif tags.historic in [ 'wayside_cross', 'wayside_shrine', 'wayside_chapel' ] %}",
+            "{% set key = 'historic' %}",
+            "{% set value = tags.historic %}",
             "{% else %}",
             "{% set key = 'amenity' %}",
             "{% set value = tags.amenity %}",
diff --git a/resources.json b/resources.json
index 04f30bd..014a2bf 100644
--- a/resources.json
+++ b/resources.json
@@ -6,6 +6,7 @@
         "de": "Ressourcengewinnung",
         "en": "Resource Extraction",
         "fr": "Extraction des ressources",
+        "hu": "Bányászat",
         "it": "Areee estrattive",
         "nl": "Grondstoffenwinning",
         "pt": "Extração de recursos",
diff --git a/tourism_attractions.json b/tourism_attractions.json
index f9a36f3..7fdfea7 100644
--- a/tourism_attractions.json
+++ b/tourism_attractions.json
@@ -8,7 +8,7 @@
         "en": "Tourism",
         "et": "Turism",
         "fr": "Tourisme",
-        "hu": "Túrizmus",
+        "hu": "Látnivalók",
         "it": "Turismo",
         "ja": "観光",
         "nl": "Toerisme",
diff --git a/tourism_services.json b/tourism_services.json
index 970d16c..721916e 100644
--- a/tourism_services.json
+++ b/tourism_services.json
@@ -8,7 +8,7 @@
         "en": "Tourism",
         "et": "Turism",
         "fr": "Tourisme",
-        "hu": "Túrizmus",
+        "hu": "Turisztikai szolgáltatások",
         "it": "Turismo",
         "ja": "観光",
         "nl": "Toerisme",
diff --git a/transport_alternative.json b/transport_alternative.json
index 703cc56..32278c7 100644
--- a/transport_alternative.json
+++ b/transport_alternative.json
@@ -5,7 +5,7 @@
         "el": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
         "et": "Alternatiivne (jalgrattasõit, matkamine, ...)",
         "fr": "Alternatif (Cyclisme, Randonnée, ...)",
-        "hu": "Alternatív (Krékpár, Túra)",
+        "hu": "Alternatív (Kerékpár, Túra)",
         "it": "Alternativi (bicicletta, camminate, ...)",
         "ja": "その他交通 (サイクリング、ハイキング、...)",
         "nl": "Alternatief (Fiets, Wandel, ...)",
diff --git a/walk_amenities.json b/walk_amenities.json
index 6aeba52..63f56b6 100644
--- a/walk_amenities.json
+++ b/walk_amenities.json
@@ -4,6 +4,7 @@
         "de": "Einrichtungen",
         "en": "Amenities",
         "fr": "Équipements piétons",
+        "hu": "Gyalogos létesítmények",
         "pt-br": "Equipamentos"
     },
     "query": {
diff --git a/waste.json b/waste.json
index 662e2c7..0895142 100644
--- a/waste.json
+++ b/waste.json
@@ -6,6 +6,7 @@
         "de": "Entsorgung",
         "en": "Disposal",
         "fr": "Déchets/Recyclage",
+        "hu": "Hulladék",
         "it": "Smaltimento",
         "ja": "処理場",
         "nl": "Afvalverwijdering",
diff --git a/water.json b/water.json
index f70d0ed..a2d7f22 100644
--- a/water.json
+++ b/water.json
@@ -4,6 +4,7 @@
         "de": "Gewässer",
         "en": "Waterbodies",
         "fr": "Hydrographie",
+        "hu": "Vizek",
         "pt": "Massas de água",
         "pt-br": "Hidrografia"
     },
diff --git a/wikipedia.json b/wikipedia.json
index 72bcf0d..a1774a4 100644
--- a/wikipedia.json
+++ b/wikipedia.json
@@ -4,6 +4,7 @@
         "de": "Wikipedia",
         "en": "Wikipedia",
         "fr": "Wikipédia",
+        "hu": "Wikipédia",
         "pt": "Wikipédia",
         "pt-br": "Wikipédia"
     },
diff --git a/works.json b/works.json
index 75bc26e..b9d6bca 100644
--- a/works.json
+++ b/works.json
@@ -6,6 +6,7 @@
         "de": "Fabriken",
         "en": "Works",
         "fr": "Zones industrielles",
+        "hu": "Üzemek",
         "it": "Fabbriche",
         "ja": "工場",
         "nl": "Fabrieken",