diff --git a/administrative.json b/administrative.json
index 05bc2d1..8ca7688 100644
--- a/administrative.json
+++ b/administrative.json
@@ -8,11 +8,11 @@
         "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",
-        "pt-br": "Divisão Político-Administrativa",
+        "pt-br": "Divisão político-administrativa",
         "ro": "Zona administrativa",
         "ru": "Административные границы"
     },
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 9e64dc3..f479aff 100644
--- a/car_furniture.json
+++ b/car_furniture.json
@@ -5,12 +5,13 @@
         "de": "Straßenausstattung",
         "en": "Street Furniture",
         "fr": "Fournitures automobiles",
+        "hu": "Jelzőtáblák",
         "it": "Dotazioni stradali",
         "ja": "街路設置公共物",
         "nl": "Straatmeubilair",
         "pl": "Elementy drogowe",
         "pt": "Mobiliário urbano",
-        "pt-br": "Mobiliário Urbano",
+        "pt-br": "Mobiliário urbano",
         "ru": "Элементы дороги",
         "uk": "Street Furniture"
     }
diff --git a/car_maxspeed.json b/car_maxspeed.json
index 5c5be40..0b50d60 100644
--- a/car_maxspeed.json
+++ b/car_maxspeed.json
@@ -4,8 +4,9 @@
         "de": "Höchstgeschwindigkeiten",
         "en": "Maxspeed",
         "fr": "Limites de vitesse",
+        "hu": "Sebességkorlátozás",
         "pt": "Velocidade máxima",
-        "pt-br": "Velocidade Máxima"
+        "pt-br": "Velocidade máxima"
     },
     "query": {
         "11": "way[highway~\"^(motorway|trunk)$\"];",
diff --git a/car_routes.json b/car_routes.json
index 22e00ba..f30b89e 100644
--- a/car_routes.json
+++ b/car_routes.json
@@ -1,7 +1,9 @@
 {
     "type": "overpass",
     "name": {
-        "en": "Car routes"
+        "en": "Car routes",
+        "hu": "Főútvonalak",
+        "pt-br": "Rotas rodoviárias"
     },
     "query": {
         "10": "relation[type=route][route=road]"
diff --git a/children.json b/children.json
index 52554e6..e814ed1 100644
--- a/children.json
+++ b/children.json
@@ -4,7 +4,8 @@
         "de": "Einrichtungen für Kinder",
         "en": "Children amenities",
         "fr": "Équipements pour enfants",
-        "pt-br": "Equipamentos Infantis"
+        "hu": "Gyermekek",
+        "pt-br": "Equipamentos infantis"
     },
     "query": {
         "15": [
diff --git a/construction.json b/construction.json
index 6a52740..73495f7 100644
--- a/construction.json
+++ b/construction.json
@@ -6,11 +6,12 @@
         "de": "Baustellen",
         "en": "Construction Sites",
         "fr": "Constructions",
+        "hu": "Építési terület",
         "it": "Cantieri",
         "ja": "工事中",
         "nl": "Bouwterrein",
         "pt": "Locais de construção",
-        "pt-br": "Terrenos e Obras",
+        "pt-br": "Terrenos vazios e obras",
         "ru": "Места строительства"
     },
     "query": {
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..2d68d92 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",
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..c12c47d 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"
     },
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/emergency.json b/emergency.json
index 2889d1e..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",
@@ -44,11 +45,12 @@
             "{% elseif tags.emergency %}",
             "{% set key = 'emergency' %}",
             "{% set value = tags.emergency %}",
-            "{% endif %}"
+            "{% endif %}",
+            "{% set kv = key ~ \"=\" ~ value %}"
         ],
-        "description": "{{ tagTrans('amenity', tags.amenity) }}",
+        "description": "{{ tagTrans(key, value) }}",
         "markerSign": [
-            "{% set data = const[tags.amenity] %}",
+            "{% set data = const[kv] %}",
             "{% if data %}",
             "{{ data.sign }}",
             "{% endif %}"
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 badae53..869a352 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",
@@ -30,6 +30,18 @@
             "   <span class='key'>{{ keyTrans('cuisine') }}:</span>",
             "   <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>",
             "  </li>",
+            "  {% set diets = tagsPrefix(tags, 'diet:') %}",
+            "  {% if diets %}",
+            "    <li class='hasSymbol'>",
+            "     <i class=\"fa fa-cutlery\" aria-hidden=\"true\"></i>",
+            "     <span class='key'>{{ keyTrans('diet') }}:</span>",
+            "     <span class='value'>",
+            "     {% for kv, k in diets %}",
+            "       {% set v = tags[k] %}",
+            "       <span title='{{ k ~ '=' ~ v }}' style='white-space: nowrap; margin-right: 0.5em;'>{% if v == 'no' %}✘ {% elseif v == 'only' %}❗{% else %}✔{% endif %}{{ keyTrans(k) }}</span>",
+            "     {% endfor %}",
+            "    </span></li>",
+            "  {% endif %}",
             "</ul>"
         ],
         "markerSign": "{% if tags.amenity=='bar' %}&#127864;{% elseif tags.amenity=='biergarten'%}&#127867;{% elseif tags.amenity=='cafe' %}&#9749;{% elseif tags.amenity=='fast_food' %}&#127828;{% elseif tags.amenity=='ice_cream' %}&#127848;{% elseif tags.amenity=='pub' %}&#127866;{% else %}&#127860;{% endif %}"
diff --git a/health.json b/health.json
index f35801e..a540782 100644
--- a/health.json
+++ b/health.json
@@ -7,12 +7,13 @@
         "el": "Υγεία",
         "en": "Health",
         "fr": "Santé",
+        "hu": "Egészségügy",
         "it": "Sanità",
         "ja": "健康",
         "nl": "Gezondheid",
         "pl": "Zdrowie",
         "pt": "Saúde",
-        "pt-br": "Saúde e Assistência",
+        "pt-br": "Saúde e assistência",
         "ro": "Sanatate",
         "ru": "Медицина",
         "uk": "Здоров'я"
@@ -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 0ae1629..c553c13 100644
--- a/hiking_routes.json
+++ b/hiking_routes.json
@@ -4,8 +4,9 @@
         "de": "Wanderrouten",
         "en": "Hiking routes",
         "fr": "Itinéraires pédestres",
+        "hu": "Turistautak",
         "pt": "Rotas de caminhada",
-        "pt-br": "Rotas de Caminhada"
+        "pt-br": "Rotas de caminhada"
     },
     "query": {
         "10": "relation[type=route][route=hiking][network~\"^(iwn)$\"]",
diff --git a/historic.json b/historic.json
index 76c2e27..8ab235d 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",
@@ -36,8 +36,14 @@
         ]
     },
     "feature": {
-        "description": "{{ tagTransList('historic', tags.historic) }}",
-        "markerSign": "{{ const[tags.historic].sign|raw }}"
+        "pre": [
+            "{% set value = tags.historic %}",
+            "{% if const[tags.historic ~ ' memorial=' ~ tags.memorial] %}",
+            "  {% set value = tags.historic ~ ' memorial=' ~ tags.memorial %}",
+            "{% endif %}"
+        ],
+        "description": "{{ tagTransList('historic', value) }}",
+        "markerSign": "{{ const[value].sign|raw }}"
     },
     "info": [
         "<table>",
@@ -78,6 +84,10 @@
             "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/index.json b/index.json
index dfcb4ee..c3eb88e 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",
@@ -22,7 +22,7 @@
                 "ro": "Timp liber, Sport si Cumparaturi",
                 "ru": "Досуг",
                 "uk": "Дозвілля",
-                "pt-br": "Lazer, Esportes e Compras",
+                "pt-br": "Lazer, esportes e compras",
                 "pt": "Lazer, desporto e compras"
             },
             "subCategories": [
@@ -62,7 +62,7 @@
                 "es": "Servicios",
                 "et": "Teenused",
                 "fr": "Services",
-                "hu": "Szolgáltatás",
+                "hu": "Szolgáltatások",
                 "it": "Servizi",
                 "ja": "サービス",
                 "nl": "Dienstverlening",
@@ -70,7 +70,7 @@
                 "ro": "Servicii",
                 "ru": "Услуги",
                 "uk": "Послуги",
-                "pt-br": "Serviços",
+                "pt-br": "Prestação de serviços",
                 "pt": "Serviços"
             },
             "subCategories": [
@@ -119,7 +119,7 @@
                 "ro": "Transport",
                 "ru": "Транспорт",
                 "uk": "Транспорт",
-                "pt-br": "Transportes",
+                "pt-br": "Mobilidade",
                 "pt": "Transportes"
             },
             "subCategories": [
@@ -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": [
                         {
@@ -180,7 +182,7 @@
                         "ro": "Transport public",
                         "ru": "Общественный транспорт",
                         "uk": "Громадський транспорт",
-                        "pt-br": "Transporte Público",
+                        "pt-br": "Transporte público",
                         "pt": "Transportes públicos"
                     },
                     "subCategories": [
@@ -208,8 +210,9 @@
                         "ro": "Trafic individual",
                         "ru": "Частный транспорт",
                         "uk": "Приватний транспорт",
-                        "pt-br": "Tráfego Individual",
-                        "pt": "Transporte individual"
+                        "pt-br": "Tráfego 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": [
                 {
@@ -303,7 +307,8 @@
                 "de": "Spezial",
                 "pt-br": "Especial",
                 "fr": "Catégories spéciales",
-                "pt": "Especial"
+                "pt": "Especial",
+                "hu": "Speciális"
             },
             "subCategories": [
                 {
@@ -315,5 +320,8 @@
             ]
         }
     ],
-    "name": {}
+    "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..c2e4e16 100644
--- a/lang/ast.json
+++ b/lang/ast.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "Infraestructures",
     "category:car_furniture": "Acondicionamientu urbanu",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Comunicaciones",
     "category:construction": "Sitios d'obres",
@@ -18,14 +19,16 @@
     "category:education": "Servicios educativos",
     "category:emergency": "Servicios d'emerxencia",
     "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:military": "Militar",
     "category:mtb-routes": "",
     "category:natural": "Formaciones naturales",
@@ -38,30 +41,32 @@
     "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-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..8be27ba 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Comunicacions",
     "category:construction": "",
@@ -18,14 +19,16 @@
     "category:education": "",
     "category:emergency": "Serveis d'emergència",
     "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:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
@@ -38,26 +41,32 @@
     "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-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..05c221e 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "Občasnká vybavenost",
     "category:car_furniture": "Pouliční přislušenství",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Komunikace",
     "category:construction": "Staveniště",
@@ -18,14 +19,16 @@
     "category:education": "Vzdělávací služby",
     "category:emergency": "Pohotovostní služby",
     "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:military": "Vojenské",
     "category:mtb-routes": "",
     "category:natural": "Přírodní úkazy",
@@ -38,30 +41,32 @@
     "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-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..64e096f 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "Einrichtungen",
     "category:car_furniture": "Straßenausstattung",
     "category:car_maxspeed": "Höchstgeschwindigkeiten",
+    "category:car_routes": "",
     "category:children": "Einrichtungen für Kinder",
     "category:communication": "Kommunikation",
     "category:construction": "Baustellen",
@@ -18,14 +19,16 @@
     "category:education": "Bildungseinrichtungen",
     "category:emergency": "Notfalldienste",
     "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:military": "Militär",
     "category:mtb-routes": "",
     "category:natural": "Geographische Objekte",
@@ -38,34 +41,32 @@
     "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-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..8dd6d13 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Επικοινωνίες",
     "category:construction": "",
@@ -18,14 +19,16 @@
     "category:education": "Υπηρεσίες Εκπαίδευσης",
     "category:emergency": "Υπηρεσίες Έκτακτης Ανάγκης",
     "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:military": "Στρατιωτικό",
     "category:mtb-routes": "",
     "category:natural": "Φυσικοί Σχηματισμοί",
@@ -38,28 +41,32 @@
     "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-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..302245a 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "Amenities",
     "category:car_furniture": "Street Furniture",
     "category:car_maxspeed": "Maxspeed",
+    "category:car_routes": "Car routes",
     "category:children": "Children amenities",
     "category:communication": "Communication",
     "category:construction": "Construction Sites",
@@ -18,14 +19,16 @@
     "category:education": "Educational Services",
     "category:emergency": "Emergency Services",
     "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:military": "Military",
     "category:mtb-routes": "Mountain bike routes",
     "category:natural": "Natural Formations",
@@ -38,34 +41,32 @@
     "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-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..98640c8 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "",
     "category:construction": "",
@@ -18,14 +19,16 @@
     "category:education": "",
     "category:emergency": "Servicios de emergencia",
     "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:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
@@ -38,26 +41,32 @@
     "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-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..32fb054 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Kommunikatsioon",
     "category:construction": "",
@@ -18,14 +19,16 @@
     "category:education": "Haridusteenused",
     "category:emergency": "Hädaabi teenused",
     "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:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
@@ -38,29 +41,32 @@
     "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-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 290c767..6fec0e0 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -7,6 +7,7 @@
     "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:communication": "Communication",
     "category:construction": "Constructions",
@@ -18,19 +19,21 @@
     "category:education": "Éducation",
     "category:emergency": "Services d'urgence",
     "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:military": "Militaire",
-    "category:mtb-routes": "",
+    "category:mtb-routes": "Itinéraires de VTT",
     "category:natural": "Éléments naturels",
     "category:other": "Autres",
-    "category:outdoor": "",
+    "category:outdoor": "Activités de plein air",
     "category:phone": "Téléphone",
     "category:places": "Lieux",
     "category:places_geo": "Lieux",
@@ -38,34 +41,32 @@
     "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-routes": "",
+    "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..541d46f 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -1,66 +1,72 @@
 {
-    "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: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:emergency": "Vészhelyzet",
+    "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:military": "Katonai objektumok",
+    "category:mtb-routes": "Hegyikerékpáros útvonalak",
     "category:natural": "Természeti képződmények",
     "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-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..96517f0 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "Infrastrutture",
     "category:car_furniture": "Dotazioni stradali",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Communicazioni",
     "category:construction": "Cantieri",
@@ -18,14 +19,16 @@
     "category:education": "Istruzione",
     "category:emergency": "Servizi d'emergenza",
     "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:military": "Militare",
     "category:mtb-routes": "",
     "category:natural": "Natura",
@@ -38,30 +41,32 @@
     "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-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..b1e963f 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "生活環境",
     "category:car_furniture": "街路設置公共物",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "交流",
     "category:construction": "工事中",
@@ -18,14 +19,16 @@
     "category:education": "教育サービス",
     "category:emergency": "緊急サービス",
     "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:military": "軍事",
     "category:mtb-routes": "",
     "category:natural": "自然地層",
@@ -38,30 +41,32 @@
     "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-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..edb0a13 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "Voorzieningen",
     "category:car_furniture": "Straatmeubilair",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Communicatie",
     "category:construction": "Bouwterrein",
@@ -18,14 +19,16 @@
     "category:education": "Onderwijs",
     "category:emergency": "Hulpdiensten",
     "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:military": "Militair",
     "category:mtb-routes": "",
     "category:natural": "Natuurlijke Formaties",
@@ -38,30 +41,32 @@
     "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-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..45961b0 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "",
     "category:car_furniture": "Elementy drogowe",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "",
     "category:construction": "",
@@ -18,14 +19,16 @@
     "category:education": "Edukacyjne",
     "category:emergency": "",
     "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:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
@@ -38,29 +41,32 @@
     "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-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 2018af4..a79642a 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -1,15 +1,16 @@
 {
-    "category:administrative": "Divisão Político-Administrativa",
+    "category:administrative": "Divisão político-administrativa",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Equipamentos",
     "category:alternative_routes": "Rotas",
     "category:buildings": "Edificações",
     "category:car_amenities": "Equipamentos",
-    "category:car_furniture": "Mobiliário Urbano",
-    "category:car_maxspeed": "Velocidade Máxima",
-    "category:children": "Equipamentos Infantis",
+    "category:car_furniture": "Mobiliário urbano",
+    "category:car_maxspeed": "Velocidade máxima",
+    "category:car_routes": "Rotas rodoviárias",
+    "category:children": "Equipamentos infantis",
     "category:communication": "Comunicação",
-    "category:construction": "Terrenos e Obras",
+    "category:construction": "Terrenos vazios e obras",
     "category:craft": "Ofícios",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
@@ -18,54 +19,54 @@
     "category:education": "Educação",
     "category:emergency": "Emergência",
     "category:financial": "Finanças",
-    "category:gastro-smoking": "Gastronomia sem fumo",
     "category:gastro": "Gastronomia",
-    "category:health": "Saúde e Assistência",
-    "category:hiking_routes": "Rotas de Caminhada",
+    "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": "",
+    "category:index": "Índice",
+    "category:infrastructure": "Infraestrutura",
     "category:internet": "Acesso à Internet",
     "category:leisure": "Lazer",
+    "category:leisure_sport_shopping": "Lazer, esportes e compras",
     "category:military": "Militar",
-    "category:mtb-routes": "",
-    "category:natural": "Formações Naturais",
+    "category:mtb-routes": "Rotas mountain bike",
+    "category:natural": "Formações naturais",
     "category:other": "Outros",
-    "category:outdoor": "",
+    "category:outdoor": "Atividades ao ar livre",
     "category:phone": "Telefone",
     "category:places": "Lugares",
     "category:places_geo": "Lugares",
     "category:playgrounds": "Parquinhos",
     "category:post": "Correios",
     "category:power": "Energia",
-    "category:pt": "",
-    "category:pt:stops": "Paradas e Estações",
+    "category:pt": "Mapa de transporte público",
     "category:pt:routes": "Rotas",
+    "category:pt:stops": "Paradas e estações",
     "category:pt_amenities": "Equipamentos",
-    "category:public": "Serviços Públicos",
-    "category:railway-electrification": "Eletrificação Ferroviária",
-    "category:railway-infrastructure": "Infraestrutura Ferroviária",
-    "category:railway-routes": "",
+    "category:public": "Serviços públicos",
+    "category:railway": "Ferrovia",
+    "category:railway-electrification": "Eletrificação ferroviária",
+    "category:railway-infrastructure": "Infraestrutura ferroviária",
+    "category:railway-routes": "Rotas ferroviárias",
     "category:religion": "Religião",
-    "category:residential": "Áreas Residenciais",
-    "category:resources": "Extração de Recursos",
+    "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": "Turismo",
-    "category:transport_alternative": "",
+    "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": "Serviços",
-    "category:special": "Especial",
-    "category:transport": "Transportes",
-    "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..e055231 100644
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "",
     "category:car_furniture": "Mobiliário urbano",
     "category:car_maxspeed": "Velocidade máxima",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Comunicação",
     "category:construction": "Locais de construção",
@@ -18,14 +19,16 @@
     "category:education": "Educação",
     "category:emergency": "Emergência",
     "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:military": "Militar",
     "category:mtb-routes": "",
     "category:natural": "Formações naturais",
@@ -38,34 +41,32 @@
     "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-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..d79d6b0 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Comunicatii",
     "category:construction": "",
@@ -18,14 +19,16 @@
     "category:education": "Servicii educatie",
     "category:emergency": "Servicii urgenta",
     "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:military": "Militar",
     "category:mtb-routes": "",
     "category:natural": "",
@@ -38,29 +41,32 @@
     "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-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..7a2a36f 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "Обслуживание транспорта",
     "category:car_furniture": "Элементы дороги",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Услуги связи",
     "category:construction": "Места строительства",
@@ -18,14 +19,16 @@
     "category:education": "Образование",
     "category:emergency": "Экстренные службы",
     "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:military": "Вооружённые силы",
     "category:mtb-routes": "",
     "category:natural": "Природные образования",
@@ -38,30 +41,32 @@
     "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-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..2f47544 100644
--- a/lang/template.json
+++ b/lang/template.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "",
     "category:car_furniture": "",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "",
     "category:construction": "",
@@ -18,14 +19,16 @@
     "category:education": "",
     "category:emergency": "",
     "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:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
@@ -38,21 +41,29 @@
     "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-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..e9778eb 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "Amenities",
     "category:car_furniture": "Street Furniture",
     "category:car_maxspeed": "",
+    "category:car_routes": "",
     "category:children": "",
     "category:communication": "Телекомунікації",
     "category:construction": "",
@@ -18,14 +19,16 @@
     "category:education": "Освіта",
     "category:emergency": "Швидка допомога",
     "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:military": "",
     "category:mtb-routes": "",
     "category:natural": "Природне середовище",
@@ -38,29 +41,32 @@
     "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-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/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 9793a62..08d1270 100644
--- a/mtb-routes.json
+++ b/mtb-routes.json
@@ -1,7 +1,10 @@
 {
     "type": "overpass",
     "name": {
-        "en": "Mountain bike routes"
+        "en": "Mountain bike routes",
+        "fr": "Itinéraires de VTT",
+        "hu": "Hegyikerékpáros útvonalak",
+        "pt-br": "Rotas mountain bike"
     },
     "query": {
         "13": "relation[type=route][route=mtb]"
diff --git a/natural.json b/natural.json
index 4faac84..1e2d84c 100644
--- a/natural.json
+++ b/natural.json
@@ -12,7 +12,7 @@
         "ja": "自然地層",
         "nl": "Natuurlijke Formaties",
         "pt": "Formações naturais",
-        "pt-br": "Formações Naturais",
+        "pt-br": "Formações naturais",
         "ru": "Природные образования",
         "uk": "Природне середовище"
     },
diff --git a/outdoor.json b/outdoor.json
index eee4aca..eb3c290 100644
--- a/outdoor.json
+++ b/outdoor.json
@@ -2,7 +2,10 @@
     "type": "index",
     "name": {
         "de": "Freiluftaktivitäten",
-        "en": "Outdoor activities"
+        "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 22c8ee2..bf28e33 100644
--- a/pt.json
+++ b/pt.json
@@ -1,8 +1,10 @@
 {
     "type": "overpass",
     "name": {
+        "de": "ÖV Karte",
         "en": "Public transport map",
-        "de": "ÖV Karte"
+        "hu": "Tömegközlekedési térkép",
+        "pt-br": "Mapa de transporte público"
     },
     "query": {
         "12": "relation[type=route][route~\"^(subway|monorail|ferry|train)$\"];",
@@ -29,7 +31,7 @@
                 "ja": "停留所と駅",
                 "nl": "Haltes en Stations",
                 "pl": "Przystanki i Stacje",
-                "pt-br": "Paradas e Estações",
+                "pt-br": "Paradas e estações",
                 "ru": "Остановки и станции",
                 "uk": "Зупинки та станції"
             }
@@ -40,6 +42,7 @@
                 "de": "Routen",
                 "en": "Routes",
                 "fr": "Lignes",
+                "hu": "Útvonalak",
                 "pt": "Rotas",
                 "pt-br": "Rotas"
             }
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 55c4c18..cf28f62 100644
--- a/public.json
+++ b/public.json
@@ -8,11 +8,12 @@
         "en": "Public Services",
         "et": "Kommunaalteenused",
         "fr": "Services Publics",
+        "hu": "Közszolgáltatások",
         "it": "Servizi pubblici",
         "ja": "公共サービス",
         "nl": "Openbare diensten",
         "pt": "Serviços públicos",
-        "pt-br": "Serviços Públicos",
+        "pt-br": "Serviços públicos",
         "ro": "Servicii publice",
         "ru": "Общественные места",
         "uk": "Громадські місця"
diff --git a/railway-electrification.json b/railway-electrification.json
index fdb6cde..f54ba20 100644
--- a/railway-electrification.json
+++ b/railway-electrification.json
@@ -4,8 +4,9 @@
         "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"
+        "pt-br": "Eletrificação ferroviária"
     },
     "query": {
         "11": "way[railway=rail][railway!~'^(platform|abandoned|disused|station|proposed|subway_entrance)$'][usage~'^(main|branch)$'];",
diff --git a/railway-infrastructure.json b/railway-infrastructure.json
index 1e8a258..9381048 100644
--- a/railway-infrastructure.json
+++ b/railway-infrastructure.json
@@ -4,8 +4,9 @@
         "de": "Eisenbahn Infrastruktur",
         "en": "Railway infrastructure",
         "fr": "Infrastructure ferroviaire",
+        "hu": "Vasúti infrastruktúra",
         "pt": "Infraestrutura ferroviária",
-        "pt-br": "Infraestrutura Ferroviária"
+        "pt-br": "Infraestrutura ferroviária"
     },
     "query": {
         "11": "(way[railway=rail][usage~'^(main|branch)$'];node[railway~'^(station)$'];)",
@@ -152,4 +153,4 @@
         "{% endif %}",
         "</table>"
     ]
-}
\ No newline at end of file
+}
diff --git a/railway-routes.json b/railway-routes.json
index ba5c66f..8745895 100644
--- a/railway-routes.json
+++ b/railway-routes.json
@@ -1,7 +1,10 @@
 {
     "type": "overpass",
     "name": {
-        "en": "Railway Routes"
+        "en": "Railway Routes",
+        "fr": "Lignes ferroviaires",
+        "hu": "Vasútvonalak",
+        "pt-br": "Rotas ferroviárias"
     },
     "query": {
         "12": "relation[type=route][route=railway]"
diff --git a/residential.json b/residential.json
index cb97078..9bacc7d 100644
--- a/residential.json
+++ b/residential.json
@@ -13,7 +13,7 @@
         "ja": "住居エリア",
         "nl": "Woongebieden",
         "pt": "Áreas residenciais",
-        "pt-br": "Áreas Residenciais",
+        "pt-br": "Áreas residenciais",
         "ro": "Zona rezidentiala",
         "ru": "Жилые районы",
         "uk": "Житлова зона"
diff --git a/resources.json b/resources.json
index e0f8436..014a2bf 100644
--- a/resources.json
+++ b/resources.json
@@ -6,10 +6,11 @@
         "de": "Ressourcengewinnung",
         "en": "Resource Extraction",
         "fr": "Extraction des ressources",
+        "hu": "Bányászat",
         "it": "Areee estrattive",
         "nl": "Grondstoffenwinning",
         "pt": "Extração de recursos",
-        "pt-br": "Extração de Recursos",
+        "pt-br": "Extração de recursos",
         "ru": "Добыча ресурсов"
     },
     "query": {
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 680c183..721916e 100644
--- a/tourism_services.json
+++ b/tourism_services.json
@@ -8,13 +8,13 @@
         "en": "Tourism",
         "et": "Turism",
         "fr": "Tourisme",
-        "hu": "Túrizmus",
+        "hu": "Turisztikai szolgáltatások",
         "it": "Turismo",
         "ja": "観光",
         "nl": "Toerisme",
         "pl": "Turystyka",
         "pt": "Turismo",
-        "pt-br": "Turismo",
+        "pt-br": "Serviços de turismo",
         "ro": "Turism",
         "ru": "Туризм",
         "uk": "Туризм"
diff --git a/transport_alternative.json b/transport_alternative.json
index ec5b244..32278c7 100644
--- a/transport_alternative.json
+++ b/transport_alternative.json
@@ -5,10 +5,11 @@
         "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, ...)",
+        "pt-br": "Transporte alternativo",
         "ro": "Alternativ(Bicicleta,Drumetii)",
         "ru": "Альтернативное передвижение (Велоспорт, Пешие прогулки, ...)",
         "uk": "Інші (Велосипедні, піші, ...)"
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 137f0b9..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"
     },
@@ -51,7 +52,7 @@
             "0",
             "{% elseif tags.waterway == 'river' %}",
             "1",
-            "{% elseif tags.waterway == 'stream' %}",
+            "{% elseif tags.waterway == 'stream' or tags.waterway == 'drain' %}",
             "3",
             "{% elseif tags.waterway == 'ditch' %}",
             "5",
@@ -63,7 +64,7 @@
             "width": [
                 "{% if tags.waterway == 'river' %}",
                 "4",
-                "{% elseif tags.waterway == 'stream' %}",
+                "{% elseif tags.waterway == 'stream' or tags.waterway == 'drain' %}",
                 "2",
                 "{% elseif tags.waterway == 'ditch' %}",
                 "1",
@@ -81,7 +82,7 @@
                 "{% endif %}"
             ],
             "text": [
-                "{% if type=='way' and tags.waterway in [ 'river', 'stream', 'canal', 'ditch', 'wadi', 'drystream' ] %}",
+                "{% if type=='way' and tags.waterway in [ 'river', 'stream', 'canal', 'ditch', 'wadi', 'drystream', 'drain' ] %}",
                 "{{ tags.name }}   ➔   ",
                 "{% endif %}"
             ],
@@ -102,7 +103,7 @@
         "{% if map.zoom >= 13 %}",
         "  <tr>",
         "    <td>{{ markerLine(evaluate({ \"waterway\": \"stream\" }))|raw }}</td>",
-        "    <td>{{ tagTrans('waterway', 'stream') }}</td>",
+        "    <td>{{ tagTrans('waterway', 'stream') }}, {{ tagTrans('waterway', 'drain') }}</td>",
         "  </tr>",
         "  <tr>",
         "    <td>{{ markerLine(evaluate({ \"waterway\": \"ditch\" }))|raw }}</td>",
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",