diff --git a/android/jni/com/mapswithme/core/jni_helper.hpp b/android/jni/com/mapswithme/core/jni_helper.hpp
index d5d4118fe6..9a68e28109 100644
--- a/android/jni/com/mapswithme/core/jni_helper.hpp
+++ b/android/jni/com/mapswithme/core/jni_helper.hpp
@@ -4,13 +4,16 @@
 
 #include "ScopedLocalRef.hpp"
 
+#include "base/buffer_vector.hpp"
 #include "base/logging.hpp"
 
 #include "geometry/point2d.hpp"
 
+#include <iterator>
 #include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 extern jclass g_mapObjectClazz;
 extern jclass g_featureIdClazz;
@@ -89,7 +92,8 @@ jobjectArray ToJavaArray(JNIEnv * env, jclass clazz, TIt begin, TIt end, size_t
 template<typename TContainer, typename TToJavaFn>
 jobjectArray ToJavaArray(JNIEnv * env, jclass clazz, TContainer const & src, TToJavaFn && toJavaFn)
 {
-  return ToJavaArray(env, clazz, begin(src), end(src), src.size(), std::forward<TToJavaFn>(toJavaFn));
+  return ToJavaArray(env, clazz, std::begin(src), std::end(src), src.size(),
+                     std::forward<TToJavaFn>(toJavaFn));
 }
 
 jobjectArray ToJavaStringArray(JNIEnv * env, std::vector<std::string> const & src);
diff --git a/base/buffer_vector.hpp b/base/buffer_vector.hpp
index ffad520376..34805ea3dd 100644
--- a/base/buffer_vector.hpp
+++ b/base/buffer_vector.hpp
@@ -460,3 +460,24 @@ inline bool operator>(buffer_vector<T, N1> const & v1, buffer_vector<T, N2> cons
 {
   return v2 < v1;
 }
+
+namespace std
+{
+template <typename T, size_t N>
+typename buffer_vector<T, N>::iterator begin(buffer_vector<T, N> & v)
+{
+  return v.begin();
+}
+
+template <typename T, size_t N>
+typename buffer_vector<T, N>::const_iterator begin(buffer_vector<T, N> const & v)
+{
+  return v.begin();
+}
+
+template <typename T, size_t N>
+typename buffer_vector<T, N>::const_iterator end(buffer_vector<T, N> const & v)
+{
+  return v.end();
+}
+}  // namespace std
diff --git a/coding/coding_tests/string_utf8_multilang_tests.cpp b/coding/coding_tests/string_utf8_multilang_tests.cpp
index b79a512a1b..b002ad134f 100644
--- a/coding/coding_tests/string_utf8_multilang_tests.cpp
+++ b/coding/coding_tests/string_utf8_multilang_tests.cpp
@@ -127,7 +127,8 @@ UNIT_TEST(MultilangString_LangNames)
   auto const & langs = StringUtf8Multilang::GetSupportedLanguages();
   // Using size_t workaround, because our logging/testing macroses do not support passing POD types
   // by value, only by reference. And our constant is a constexpr.
-  TEST_EQUAL(langs.size(), size_t(StringUtf8Multilang::kMaxSupportedLanguages), ());
+  TEST_LESS_OR_EQUAL(langs.size(), static_cast<size_t>(StringUtf8Multilang::kMaxSupportedLanguages),
+                     ());
   auto const international = StringUtf8Multilang::GetLangIndex("int_name");
   TEST_EQUAL(langs[international].m_code, string("int_name"), ());
 }
diff --git a/coding/string_utf8_multilang.cpp b/coding/string_utf8_multilang.cpp
index fb84f41c61..355603236c 100644
--- a/coding/string_utf8_multilang.cpp
+++ b/coding/string_utf8_multilang.cpp
@@ -1,17 +1,20 @@
 #include "coding/string_utf8_multilang.hpp"
 
+#include <algorithm>
+#include <array>
+
 #include "defines.hpp"
 
 using namespace std;
 
 namespace
 {
-// TODO(AlexZ): Review and replace invalid languages which does not map correctly to
-// iOS/Android locales/UI by valid and more popular ones.
-// Languages below were choosen after sorting name:<lang> tags in 2011.
-// Note, that it's not feasible to increase languages number here due to
-// our current encoding (6 bit to store language code).
-StringUtf8Multilang::Languages const g_languages = {
+// Order is important. Any reordering breaks backward compatibility.
+// Languages with code |StringUtf8Multilang::kReservedLang| may be used for another language after
+// several data releases.
+// Note that it's not feasible to increase languages number here due to current encoding (6 bit to
+// store language code).
+array<StringUtf8Multilang::Lang, StringUtf8Multilang::kMaxSupportedLanguages> const kLanguages = {
     {{"default", "Native for each country", "Any-Latin"},
      {"en", "English", ""},
      {"ja", "日本語", ""},
@@ -41,35 +44,35 @@ StringUtf8Multilang::Languages const g_languages = {
      {"uk", "Українська", "Ukrainian-Latin/BGN"},
      {"ca", "Català", ""},
      {"hu", "Magyar", ""},
-     {"hsb", "Hornjoserbšćina", ""},
+     {StringUtf8Multilang::kReservedLang /* hsb */, "", ""},
      {"eu", "Euskara", ""},
      {"fa", "فارسی", "Any-Latin"},
-     {"br", "Breton", ""},
+     {StringUtf8Multilang::kReservedLang /* br */, "", ""},
      {"pl", "Polski", ""},
      {"hy", "Հայերէն", "Armenian-Latin"},
-     {"kn", "ಕನ್ನಡ", "Kannada-Latin"},
+     {StringUtf8Multilang::kReservedLang /* kn */, "", ""},
      {"sl", "Slovenščina", ""},
      {"ro", "Română", ""},
-     {"sq", "Shqipe", ""},
+     {"sq", "Shqip", ""},
      {"am", "አማርኛ", "Amharic-Latin/BGN"},
-     {"fy", "Frysk", ""},
+     {StringUtf8Multilang::kReservedLang /* fy */, "", ""},
      {"cs", "Čeština", ""},
-     {"gd", "Gàidhlig", ""},
+     {StringUtf8Multilang::kReservedLang /* gd */, "", ""},
      {"sk", "Slovenčina", ""},
      {"af", "Afrikaans", ""},
      {"ja_kana", "日本語(カタカナ)", "Katakana-Latin"},
-     {"lb", "Luxembourgish", ""},
+     {StringUtf8Multilang::kReservedLang /* lb */, "", ""},
      {"pt", "Português", ""},
      {"hr", "Hrvatski", ""},
-     {"fur", "Friulian", ""},
+     {StringUtf8Multilang::kReservedLang /* fur */, "", ""},
      {"vi", "Tiếng Việt", ""},
      {"tr", "Türkçe", ""},
      {"bg", "Български", "Bulgarian-Latin/BGN"},
-     {"eo", "Esperanto", ""},
+     {StringUtf8Multilang::kReservedLang /* eo */, "", ""},
      {"lt", "Lietuvių", ""},
-     {"la", "Latin", ""},
+     {StringUtf8Multilang::kReservedLang /* la */, "", ""},
      {"kk", "Қазақ", "Kazakh-Latin/BGN"},
-     {"gsw", "Schwiizertüütsch", ""},
+     {StringUtf8Multilang::kReservedLang /* gsw */, "", ""},
      {"et", "Eesti", ""},
      {"ku", "Kurdish", "Any-Latin"},
      {"mn", "Mongolian", "Mongolian-Latin/BGN"},
@@ -77,29 +80,49 @@ StringUtf8Multilang::Languages const g_languages = {
      {"lv", "Latviešu", ""},
      {"hi", "हिन्दी", "Any-Latin"}}};
 
-static_assert(g_languages.size() == StringUtf8Multilang::kMaxSupportedLanguages,
-              "With current encoding we are limited to 64 languages max.");
+static_assert(
+    kLanguages.size() == StringUtf8Multilang::kMaxSupportedLanguages,
+    "With current encoding we are limited to 64 languages max. And we need kLanguages.size()"
+    " to be exactly 64 for backward compatibility.");
+
+bool IsSupportedLangCode(int8_t langCode)
+{
+  return langCode >= 0 && langCode < static_cast<int8_t>(kLanguages.size()) &&
+         kLanguages[langCode].m_code != StringUtf8Multilang::kReservedLang;
+}
 }  // namespace
 
 int8_t constexpr StringUtf8Multilang::kUnsupportedLanguageCode;
 int8_t constexpr StringUtf8Multilang::kDefaultCode;
 int8_t constexpr StringUtf8Multilang::kEnglishCode;
 int8_t constexpr StringUtf8Multilang::kInternationalCode;
+char constexpr StringUtf8Multilang::kReservedLang[9 /* strlen("reserved") + 1 */];
 
 // static
 StringUtf8Multilang::Languages const & StringUtf8Multilang::GetSupportedLanguages()
 {
   // Asserts for generic class constants.
-  ASSERT_EQUAL(g_languages[kDefaultCode].m_code, string("default"), ());
-  ASSERT_EQUAL(g_languages[kInternationalCode].m_code, string("int_name"), ());
-  return g_languages;
+  ASSERT_EQUAL(kLanguages[kDefaultCode].m_code, string("default"), ());
+  ASSERT_EQUAL(kLanguages[kInternationalCode].m_code, string("int_name"), ());
+  static StringUtf8Multilang::Languages languages;
+  if (languages.empty())
+  {
+    copy_if(kLanguages.cbegin(), kLanguages.cend(), back_inserter(languages),
+            [](Lang const & lang) { return lang.m_code != kReservedLang; });
+  }
+
+  return languages;
 }
 
 // static
 int8_t StringUtf8Multilang::GetLangIndex(string const & lang)
 {
-  for (size_t i = 0; i < g_languages.size(); ++i)
-    if (lang == g_languages[i].m_code)
+  if (lang == kReservedLang)
+    return kUnsupportedLanguageCode;
+
+  for (size_t i = 0; i < kLanguages.size(); ++i)
+
+    if (lang == kLanguages[i].m_code)
       return static_cast<int8_t>(i);
 
   return kUnsupportedLanguageCode;
@@ -108,25 +131,28 @@ int8_t StringUtf8Multilang::GetLangIndex(string const & lang)
 // static
 char const * StringUtf8Multilang::GetLangByCode(int8_t langCode)
 {
-  if (langCode < 0 || langCode >= static_cast<int8_t>(g_languages.size()))
+  if (!IsSupportedLangCode(langCode))
     return "";
-  return g_languages[langCode].m_code;
+
+  return kLanguages[langCode].m_code;
 }
 
 // static
 char const * StringUtf8Multilang::GetLangNameByCode(int8_t langCode)
 {
-  if (langCode < 0 || langCode >= static_cast<int8_t>(g_languages.size()))
+  if (!IsSupportedLangCode(langCode))
     return "";
-  return g_languages[langCode].m_name;
+
+  return kLanguages[langCode].m_name;
 }
 
 // static
 char const * StringUtf8Multilang::GetTransliteratorIdByCode(int8_t langCode)
 {
-  if (langCode < 0 || langCode >= static_cast<int8_t>(g_languages.size()))
+  if (!IsSupportedLangCode(langCode))
     return "";
-  return g_languages[langCode].m_transliteratorId;
+
+  return kLanguages[langCode].m_transliteratorId;
 }
 
 size_t StringUtf8Multilang::GetNextIndex(size_t i) const
@@ -180,6 +206,9 @@ void StringUtf8Multilang::AddString(int8_t lang, string const & utf8s)
 
 bool StringUtf8Multilang::GetString(int8_t lang, string & utf8s) const
 {
+  if (!IsSupportedLangCode(lang))
+    return false;
+
   size_t i = 0;
   size_t const sz = m_s.size();
 
@@ -202,6 +231,9 @@ bool StringUtf8Multilang::GetString(int8_t lang, string & utf8s) const
 
 bool StringUtf8Multilang::HasString(int8_t lang) const
 {
+  if (!IsSupportedLangCode(lang))
+    return false;
+
   for (size_t i = 0; i < m_s.size(); i = GetNextIndex(i))
   {
     if ((m_s[i] & 0x3F) == lang)
diff --git a/coding/string_utf8_multilang.hpp b/coding/string_utf8_multilang.hpp
index ca54fbac82..7b6d5cd919 100644
--- a/coding/string_utf8_multilang.hpp
+++ b/coding/string_utf8_multilang.hpp
@@ -5,9 +5,9 @@
 #include "coding/writer.hpp"
 
 #include "base/assert.hpp"
+#include "base/buffer_vector.hpp"
 #include "base/control_flow.hpp"
 
-#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <string>
@@ -80,8 +80,9 @@ public:
   /// How many languages we support on indexing stage. See full list in cpp file.
   /// TODO(AlexZ): Review and replace invalid languages by valid ones.
   static int8_t constexpr kMaxSupportedLanguages = 64;
+  static char constexpr kReservedLang[] = "reserved";
 
-  using Languages = std::array<Lang, kMaxSupportedLanguages>;
+  using Languages = buffer_vector<Lang, kMaxSupportedLanguages>;
 
   static Languages const & GetSupportedLanguages();
 
@@ -118,8 +119,12 @@ public:
     while (i < sz)
     {
       size_t const next = GetNextIndex(i);
-      if (wrapper((m_s[i] & 0x3F), m_s.substr(i + 1, next - i - 1)) == base::ControlFlow::Break)
-        return;
+      int8_t const code = m_s[i] & 0x3F;
+      if (GetLangByCode(code) != kReservedLang &&
+          wrapper(code, m_s.substr(i + 1, next - i - 1)) == base::ControlFlow::Break)
+      {
+        break;
+      }
       i = next;
     }
   }
diff --git a/data/countries_meta.txt b/data/countries_meta.txt
index 582b37e34e..26487568f2 100644
--- a/data/countries_meta.txt
+++ b/data/countries_meta.txt
@@ -315,7 +315,7 @@
 },
 "India": {
  "driving": "l",
- "languages": ["hi", "mr", "en", "gu", "ta", "te", "bn", "as", "kn", "ml", "pa"]
+ "languages": ["hi", "mr", "en", "gu", "ta", "te", "bn", "as", "ml", "pa"]
 },
 "India_Kerala": {
  "driving": "l",
@@ -434,7 +434,7 @@
  "languages": ["lt"]
 },
 "Luxembourg": {
- "languages": ["fr", "lb", "de", "en"]
+ "languages": ["fr", "de", "en"]
 },
 "Macedonia": {
  "languages": ["mk"]
@@ -729,7 +729,7 @@
  "languages": ["nl"]
 },
 "Netherlands_Friesland": {
- "languages": ["nl", "fy"]
+ "languages": ["nl"]
 },
 "Togo": {
  "languages": ["fr"]
diff --git a/map/map_tests/transliteration_test.cpp b/map/map_tests/transliteration_test.cpp
index 44d9ff95f0..8e8a4662a7 100644
--- a/map/map_tests/transliteration_test.cpp
+++ b/map/map_tests/transliteration_test.cpp
@@ -36,7 +36,6 @@ UNIT_TEST(Transliteration_CompareSamples)
   TestTransliteration(translit, "uk", "Українська", "Ukrayinska");
   TestTransliteration(translit, "fa", "فارسی", "farsy");
   TestTransliteration(translit, "hy", "Հայերէն", "Hayeren");
-  TestTransliteration(translit, "kn", "ಕನ್ನಡ", "kannada");
   TestTransliteration(translit, "am", "አማርኛ", "amarinya");
   TestTransliteration(translit, "ja_kana", "カタカナ", "katakana");
   TestTransliteration(translit, "bg", "Български", "Bulgarski");