Review fixes.

map/search_api.cpp

@@ -85,7 +85,7 @@ SearchAPI::SearchAPI(Index & index, storage::Storage const & storage,
   , m_infoGetter(infoGetter)
   , m_delegate(delegate)
   , m_engine(m_index, GetDefaultCategories(), m_infoGetter,
-             Engine::Params(languages::GetCurrentOrig() /* locale */, 1 /* params.m_numThreads */))
+             Engine::Params(languages::GetCurrentTwine() /* locale */, 1 /* params.m_numThreads */))
 {
 }
 

search/ranker.cpp

@@ -578,8 +578,8 @@ void Ranker::MatchForSuggestions(strings::UniString const & token, int8_t locale
   for (auto const & suggest : m_suggests)
   {
     strings::UniString const & s = suggest.m_name;
-    if (suggest.m_prefixLength <= token.size() &&
-        token != s                     // do not push suggestion if it already equals to token
+    if (suggest.m_prefixLength <= token.size()
+        && token != s                  // do not push suggestion if it already equals to token
         && suggest.m_locale == locale  // push suggestions only for needed language
         && strings::StartsWith(s, token))
     {

search/region_info_getter.cpp

@@ -2,6 +2,7 @@
 
 #include "storage/country_decl.hpp"
 
+#include "base/logging.hpp"
 #include "base/stl_helpers.hpp"
 #include "base/string_utils.hpp"
 
@@ -25,6 +26,9 @@ void GetPathToRoot(storage::TCountryId const & id, storage::TCountryTree const &
   vector<storage::TCountryTree::Node const *> nodes;
   countries.Find(id, nodes);
 
+  if (nodes.empty())
+    LOG(LERROR, ("Can't find node in the countries tree for:", id));
+
   if (nodes.size() != 1 || nodes[0]->IsRoot())
     return;
 
@@ -66,7 +70,7 @@ string RegionInfoGetter::GetLocalizedFullName(storage::TCountryId const & id) co
     return strings::JoinStrings(parts, ", ");
 
   // Tries to get at least localized name for |id|, if |id| is a
-  // discussed territory.
+  // disputed territory.
   auto name = GetLocalizedCountryName(id);
   if (!name.empty())
     return name;

search/search_tests/region_info_getter_tests.cpp

@@ -2,6 +2,8 @@
 
 #include "search/region_info_getter.hpp"
 
+#include <string>
+
 using namespace search;
 
 namespace