diff --git a/coding/multilang_utf8_string.hpp b/coding/multilang_utf8_string.hpp
index c78fe14a5e..5075771144 100644
--- a/coding/multilang_utf8_string.hpp
+++ b/coding/multilang_utf8_string.hpp
@@ -75,7 +75,7 @@ public:
   /// @returns empty string if langCode is invalid.
   static char const * GetTransliteratorIdByCode(int8_t langCode);
 
-  inline bool operator==(StringUtf8Multilang const & rhs) const { return (m_s == rhs.m_s); }
+  inline bool operator==(StringUtf8Multilang const & rhs) const { return m_s == rhs.m_s; }
   inline bool operator!=(StringUtf8Multilang const & rhs) const { return !(*this == rhs); }
 
   inline void Clear() { m_s.clear(); }
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 28cd4e39e1..295777aa58 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -369,6 +369,7 @@ void FeatureType::ParseMetadata() const
 
 StringUtf8Multilang const & FeatureType::GetNames() const
 {
+  ParseCommon();
   return m_params.name;
 }
 
diff --git a/search/locality_finder.cpp b/search/locality_finder.cpp
index c84416c66e..13f0d24f13 100644
--- a/search/locality_finder.cpp
+++ b/search/locality_finder.cpp
@@ -96,11 +96,7 @@ public:
     if (population == 0)
       return;
 
-    StringUtf8Multilang names;
-    ft.ForEachName([&](int8_t lang, string const & name) {
-      names.AddString(lang, name);
-      return true;
-    });
+    auto const names = ft.GetNames();
     auto const center = ft.GetCenter();
 
     m_holder.Add(LocalityItem(names, center, population));