diff --git a/data/categories.txt b/data/categories.txt
index 1a8d3b6e47..c7fb01fff0 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -16,8 +16,10 @@
 #
 # BNF:
 # <category>           ::= <category_title> '\n' <category_item_list> '\n'
-# <category_title>     ::= <osm_type> '|' <group_title>
+# <category_title>     ::= <osm_type_list> '|' <group_title_list>
 # <group_translations> ::= <group_title> '\n' <category_item_list>
+# <osm_type_list>      ::= <osm_type> ['|' <osm_type_list>]
+# <group_title_list>   ::= <group_title> ['|' <group_title_list>]
 # <group_title>        ::= '@' <group_name>
 # <category_item_list> ::= <category_item> '\n' [category_item_list]
 # <category_item>      ::= <lang> ':' <translation_list>
@@ -5444,7 +5446,7 @@ id:3^Internet
 ro:3^Internet
 nb:3^Internet
 fi:3^Internet
-sw:^intaneti
+sw:^Intaneti
 
 natural-beach
 en:Beach|U+1F459
@@ -6108,13 +6110,13 @@ nl:^Dierentuin
 pl:^Ogród zoologiczny
 pt:^Jardim zoológico
 ro:^Grădină zoologică
-sk:^zoologická záhrada
+sk:^Zoologická záhrada
 sv:^Zoo
 sw:^Zoo
 th:^สวนสัตว์
 tr:^Hayvanat bahçesi
 uk:^Зоопарк
-vi:^vườn bách thú
+vi:^Vườn bách thú
 zh-Hans:^动物园
 zh-Hant:^動物園
 
diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp
index 123b1957a6..793cbc8f41 100644
--- a/indexer/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -19,7 +19,7 @@ enum State
 
 void ProcessSynonym(CategoriesHolder::Category::Name const & name,
                     deque<CategoriesHolder::Category::Name> & synonyms)
-{  
+{
   if (name.m_name[0] != '^')
   {
     synonyms.push_back(name);
@@ -47,7 +47,7 @@ void GroupTranslationsToSynonyms(vector<string> const & groups,
 
 void TrimGroupTranslations(CategoriesHolder::GroupTranslations & translations)
 {
-  for(auto & translation : translations)
+  for (auto & translation : translations)
   {
     for (auto & synonym : translation.second)
     {
diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp
index 222ad69760..c8e071ff0d 100644
--- a/indexer/indexer_tests/categories_test.cpp
+++ b/indexer/indexer_tests/categories_test.cpp
@@ -119,15 +119,14 @@ UNIT_TEST(CategoriesHolder_Smoke)
   }
 }
 
-UNIT_TEST(CategoriesHolder_ReadableNameSmoke)
+UNIT_TEST(CategoriesHolder_DisplayedNameSmoke)
 {
   classificator::Load();
 
   auto const & categoriesHolder = GetDefaultCategories();
   auto const & groupTranslations = categoriesHolder.GetGroupTranslations();
 
-  categoriesHolder.ForEachCategory([](CategoriesHolder::Category const & cat)
-  {
+  categoriesHolder.ForEachCategory([](CategoriesHolder::Category const & cat) {
     for (auto const & synonym : cat.m_synonyms)
     {
       TEST_NOT_EQUAL(synonym.m_name[0], '^', ("symbol ^ is used incorrectly in categories.txt "
@@ -145,7 +144,7 @@ UNIT_TEST(CategoriesHolder_ReadableNameSmoke)
   }
 }
 
-UNIT_TEST(CategoriesHolder_ReadableName)
+UNIT_TEST(CategoriesHolder_DisplayedName)
 {
   char const kCategories[] =
       "@shop\n"
@@ -176,20 +175,18 @@ UNIT_TEST(CategoriesHolder_ReadableName)
       "";
 
   classificator::Load();
-  CategoriesHolder holder(make_unique<MemReader>(kCategories, sizeof(kCategories) - 1));
+  CategoriesHolder holder(make_unique<MemReader>(kCategories, ARRAY_SIZE(kCategories) - 1));
 
-  size_t count = 0;
-  holder.ForEachCategory([&count](CategoriesHolder::Category const & cat)
-  {
-    if (count == 0)
+  holder.ForEachTypeAndCategory([](uint32_t const type, CategoriesHolder::Category const & cat) {
+    auto const readableTypeName = classif().GetReadableObjectName(type);
+    if (readableTypeName == "shop")
     {
       TEST_EQUAL(cat.m_synonyms.size(), 3, ());
       TEST_EQUAL(cat.m_synonyms[0].m_name, "Mагазин", ());
       TEST_EQUAL(cat.m_synonyms[1].m_name, "Shop", ());
       TEST_EQUAL(cat.m_synonyms[2].m_name, "market", ());
     }
-
-    if (count == 1)
+    else if (readableTypeName == "shop-alcohol")
     {
       TEST_EQUAL(cat.m_synonyms.size(), 4, ());
       TEST_EQUAL(cat.m_synonyms[0].m_name, "Alcostore", ());
@@ -197,16 +194,14 @@ UNIT_TEST(CategoriesHolder_ReadableName)
       TEST_EQUAL(cat.m_synonyms[2].m_name, "Shop", ());
       TEST_EQUAL(cat.m_synonyms[3].m_name, "Liquor Store", ());
     }
-
-    if (count == 2)
+    else if (readableTypeName == "shop-bakery")
     {
       TEST_EQUAL(cat.m_synonyms.size(), 3, ());
       TEST_EQUAL(cat.m_synonyms[0].m_name, "buns", ());
       TEST_EQUAL(cat.m_synonyms[1].m_name, "Mагазин", ());
       TEST_EQUAL(cat.m_synonyms[2].m_name, "Shop", ());
     }
-
-    if (count == 3)
+    else if (readableTypeName == "shop-butcher")
     {
       TEST_EQUAL(cat.m_synonyms.size(), 9, ());
       TEST_EQUAL(cat.m_synonyms[0].m_name, "Мясная лавка", ());
@@ -219,7 +214,10 @@ UNIT_TEST(CategoriesHolder_ReadableName)
       TEST_EQUAL(cat.m_synonyms[7].m_name, "Geschäft", ());
       TEST_EQUAL(cat.m_synonyms[8].m_name, "Laden", ());
     }
-    ++count;
+    else
+    {
+      TEST(false, ("Unexpected group name:", readableTypeName));
+    }
   });
 }