diff --git a/search/search_query.cpp b/search/search_query.cpp
index a81faee681..7b6a407431 100644
--- a/search/search_query.cpp
+++ b/search/search_query.cpp
@@ -1185,7 +1185,7 @@ bool Query::SearchLocality(MwmValue * pMwm, impl::Locality & res)
   {
     TrieIterator::Edge::EdgeStrT const & edge = pTrieRoot->m_edge[i].m_str;
     int8_t const lang = static_cast<int8_t>(edge[0]);
-    if (lang < search::CATEGORIES_LANG && params.IsLangExist(lang))
+    if (edge[0] < search::CATEGORIES_LANG && params.IsLangExist(lang))
     {
       scoped_ptr<TrieIterator> pLangRoot(pTrieRoot->GoToEdge(i));
 
diff --git a/search/search_query.hpp b/search/search_query.hpp
index cf6eaec866..dec68c3973 100644
--- a/search/search_query.hpp
+++ b/search/search_query.hpp
@@ -125,7 +125,7 @@ private:
     void EraseTokens(vector<size_t> const & eraseInds);
 
     bool IsEmpty() const { return (m_tokens.empty() && m_prefixTokens.empty()); }
-    bool IsLangExist(uint8_t l) const { return (m_langs.count(l) > 0); }
+    bool IsLangExist(int8_t l) const { return (m_langs.count(l) > 0); }
 
   private:
     void AddSynonims(Query const & q, bool isLocalities);