From 63a98e193a35fe7051e98366cc609cf05d6edd88 Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Fri, 18 Jan 2019 19:23:59 +0300
Subject: [PATCH] [search] Do not match name to request while displaying
 categorial results.

---
 search/processor.cpp | 2 +-
 search/ranker.cpp    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/search/processor.cpp b/search/processor.cpp
index 58678d5d6d..13d2c5459b 100644
--- a/search/processor.cpp
+++ b/search/processor.cpp
@@ -591,7 +591,7 @@ void Processor::InitRanker(Geocoder::Params const & geocoderParams,
   params.m_preferredTypes = m_preferredTypes;
   params.m_suggestsEnabled = searchParams.m_suggestsEnabled;
   params.m_needAddress = searchParams.m_needAddress;
-  params.m_needHighlighting = searchParams.m_needHighlighting;
+  params.m_needHighlighting = searchParams.m_needHighlighting && !geocoderParams.IsCategorialRequest();
   params.m_query = m_query;
   params.m_tokens = m_tokens;
   params.m_prefix = m_prefix;
diff --git a/search/ranker.cpp b/search/ranker.cpp
index f9ac808ab1..287487ede9 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -623,7 +623,8 @@ void Ranker::GetBestMatchName(FeatureType & f, string & name) const
 {
   KeywordLangMatcher::Score bestScore;
   auto updateScore = [&](int8_t lang, string const & s, bool force) {
-    auto const score = m_keywordsScorer.CalcScore(lang, s);
+    // Ignore name for categorial requests.
+    auto const score = m_keywordsScorer.CalcScore(lang, m_params.m_categorialRequest ? "" : s);
     if (force ? bestScore <= score : bestScore < score)
     {
       bestScore = score;