diff --git a/search/ranker.cpp b/search/ranker.cpp
index f823b9f9d1..cd09b7268e 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -374,8 +374,8 @@ public:
       }, Delimiters());
 
       // Factor is a number of the rest, not common matched tokens in Feature' name. Bigger is worse.
-      info.m_commonTokensFactor = min(3, count - int(info.m_tokenRanges[info.m_type].Size()));
-      ASSERT_GREATER_OR_EQUAL(info.m_commonTokensFactor, 0, ());
+      // Example when count == 0: UTH airport has empty name, but "ut" is a _common_ token.
+      info.m_commonTokensFactor = min(3, std::max(0, count - int(info.m_tokenRanges[info.m_type].Size())));
     }
 
     res.SetRankingInfo(info);
diff --git a/search/search_quality/search_quality_tests/real_mwm_tests.cpp b/search/search_quality/search_quality_tests/real_mwm_tests.cpp
index b4985d1cdd..7036cacb76 100644
--- a/search/search_quality/search_quality_tests/real_mwm_tests.cpp
+++ b/search/search_quality/search_quality_tests/real_mwm_tests.cpp
@@ -530,4 +530,33 @@ UNIT_CLASS_TEST(MwmTestsFixture, Generic_Buildings_Rank)
     TEST_LESS(SortedByDistance(range, center), 1000.0, ());
   }
 }
+
+UNIT_CLASS_TEST(MwmTestsFixture, UTH_Airport)
+{
+  auto const aeroportType = classif().GetTypeByPath({"aeroway", "aerodrome", "international"});
+
+  // Under UTH airport.
+  ms::LatLon const center(17.3867863, 102.7775625);
+  SetViewportAndLoadMaps(center);
+
+  // "ut" query is _common_
+  auto request = MakeRequest("ut", "en");
+  auto const & results = request->Results();
+
+  bool found = false;
+  // The first 5 will be cities suggestions.
+  for (size_t i = 0; i < 10; ++i)
+  {
+    auto const & r = results[i];
+    if (r.GetResultType() == search::Result::Type::Feature &&
+        EqualClassifType(r.GetFeatureType(), aeroportType))
+    {
+      found = true;
+      break;
+    }
+  }
+
+  TEST(found, (results));
+}
+
 } // namespace real_mwm_tests