diff --git a/data/editor.config b/data/editor.config
index 5a45105268..11b38fe94f 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -167,6 +167,7 @@
       </type>
       <type id="amenity-bank" group="banking">
         <include group="poi" />
+        <include field="internet" />
         <!-- Uncomment this and other atm fields when the code supports it. -->
         <!--include field="atm" /-->
       </type>
@@ -340,8 +341,9 @@
       <type id="amenity-toilets">
         <include field="opening_hours" />
       </type>
-      <type id="amenity-townhall" can_add="no">
+      <type id="amenity-townhall">
         <include group="poi" />
+        <include field="internet" />
       </type>
       <type id="amenity-university" group="education" can_add="no">
         <include group="poi" />
@@ -373,22 +375,23 @@
       <type id="craft" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-beekeeper" can_add="no">
+      <type id="craft-beekeeper">
         <include group="poi" />
       </type>
-      <type id="craft-blacksmith" can_add="no">
+      <type id="craft-blacksmith">
         <include group="poi" />
       </type>
-      <type id="craft-brewery" group="shop" can_add="no">
+      <type id="craft-brewery" group="shop">
         <include group="poi" />
       </type>
-      <type id="craft-carpenter" can_add="no">
+      <type id="craft-carpenter">
         <include group="poi" />
       </type>
+      <!-- Not addable because ambigous with shop=confectionery -->
       <type id="craft-confectionery" group="shop" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-electrician" can_add="no">
+      <type id="craft-electrician">
         <include group="poi" />
       </type>
       <type id="craft-electronics_repair">
@@ -397,10 +400,10 @@
       <type id="craft-gardener" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-handicraft" can_add="no">
+      <type id="craft-handicraft">
         <include group="poi" />
       </type>
-      <type id="craft-hvac" group="shop" can_add="no">
+      <type id="craft-hvac" group="shop">
         <include group="poi" />
       </type>
       <type id="craft-metal_construction" can_add="no">
@@ -412,7 +415,7 @@
       <type id="craft-photographer">
         <include group="poi" />
       </type>
-      <type id="craft-plumber" can_add="no">
+      <type id="craft-plumber">
         <include group="poi" />
       </type>
       <type id="craft-sawmill" can_add="no">
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 6eb8ce1456..2730e77a07 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -4841,16 +4841,21 @@
     zh-Hans = 工艺作坊
 
   [type.craft.beekeeper]
-    en = beekeeper
+    en = Beekeeper
+    be = Пчаляр
     ru = Пчеловод
+    uk = Бджоляр
 
   [type.craft.blacksmith]
     en = Blacksmith
-    ru = Кузнец
+    be = Кузня
+    ru = Кузница
+    uk = Кузня
 
   [type.craft.brewery]
     en = Craft Brewery
     ar = مصنع جعة
+    be = Крафтавы бровар
     cs = Pivovar
     da = Bryggeri
     de = Brauerei
@@ -4872,12 +4877,12 @@
     pt = Cervejaria artesanal
     pt-BR = Cervejaria artesanal
     ro = Berărie
-    ru = Крафтовое пиво
+    ru = Крафтовая пивоварня
     sk = Pivovar
     sv = Bryggeri
     th = โรงเบียร์
     tr = Bira Fabrikası
-    uk = Пивоварня
+    uk = Крафтова пивоварня
     vi = Nhà máy bia
     zh-Hans = 酿酒厂
     zh-Hant = 釀酒廠
@@ -4993,11 +4998,14 @@
 
   [type.craft.handicraft]
     en = Handicraft
-    ru = Декоративный мастер
+    ru = Ремесленная мастерская
 
   [type.craft.hvac]
-    en = Hvac
+    comment = Heating, Ventilation, and Air Conditioning
+    en = HVAC
     ar = تكييف
+    be = Ацяпленне, вентыляцыя і кандыцыянаванне
+    bg = Отопление, вентилация и климатизация
     cs = HVAC
     da = Blikkenslager
     de = Heizung
@@ -5015,12 +5023,12 @@
     pl = Klimatyzacja
     pt = Instalador de ar-condicionado
     pt-BR = Ar-condicionado
-    ru = Кондиционеры
+    ru = Отопление, вентиляция и кондиционирование
     sk = Vzduchotechnika
     sv = Vvs
     th = ระบบปรับอากาศ
     tr = Klimacı
-    uk = Кондиціонери
+    uk = Опалення, вентиляція та кондиціювання повітря
     vi = Điều hòa nhiệt độ
     zh-Hans = 暖通工程师
     zh-Hant = 空調設備
diff --git a/editor/editor_tests/editor_config_test.cpp b/editor/editor_tests/editor_config_test.cpp
index d325bf1d00..af94e0cdcc 100644
--- a/editor/editor_tests/editor_config_test.cpp
+++ b/editor/editor_tests/editor_config_test.cpp
@@ -48,12 +48,13 @@ UNIT_TEST(EditorConfig_TypeDescription)
     TEST_EQUAL(desc.GetEditableFields(), fields, ());
   }
   {
-    // Select amenity-bank because it goes first in config.
+    // Test that amenity-bank is selected as it goes first in config.
     editor::TypeAggregatedDescription desc;
-    TEST(config.GetTypeDescription({"amenity-bar", "amenity-bank"}, desc), ());
+    TEST(config.GetTypeDescription({"amenity-bicycle_rental", "amenity-bank"}, desc), ());
     TEST(desc.IsNameEditable(), ());
     TEST(desc.IsAddressEditable(), ());
     auto fields = poi;
+    fields.push_back(EType::FMD_INTERNET);
     base::SortUnique(fields);
     TEST_EQUAL(desc.GetEditableFields(), fields, ());
   }