diff --git a/search/search_integration_tests/tracer_tests.cpp b/search/search_integration_tests/tracer_tests.cpp
index 80ed23fc7f..b26b9ce45f 100644
--- a/search/search_integration_tests/tracer_tests.cpp
+++ b/search/search_integration_tests/tracer_tests.cpp
@@ -28,36 +28,62 @@ UNIT_CLASS_TEST(TracerTest, Smoke)
   TestCity moscow(m2::PointD(0, 0), "Moscow", "en", 100 /* rank */);
   TestCafe regularCafe(m2::PointD(0, 0));
   TestCafe moscowCafe(m2::PointD(0, 0), "Moscow", "en");
+  TestStreet tverskaya(vector<m2::PointD>{m2::PointD(0, 0), m2::PointD(0, 1)}, "Tverskaya street",
+                       "en");
 
   BuildWorld([&](TestMwmBuilder & builder) { builder.Add(moscow); });
 
   auto const id = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) {
     builder.Add(regularCafe);
     builder.Add(moscowCafe);
+    builder.Add(tverskaya);
   });
 
-  auto tracer = make_shared<Tracer>();
-
   SearchParams params;
-  params.m_query = "moscow cafe";
   params.m_inputLocale = "en";
   params.m_viewport = m2::RectD(-1, -1, 1, 1);
   params.m_mode = Mode::Everywhere;
-  params.m_tracer = tracer;
 
-  TestSearchRequest request(m_engine, params);
-  request.Run();
-  Rules rules = {ExactMatch(id, regularCafe), ExactMatch(id, moscowCafe)};
-  TEST(ResultsMatch(request.Results(), rules), ());
+  {
+    params.m_query = "moscow cafe";
+    auto tracer = make_shared<Tracer>();
+    params.m_tracer = tracer;
 
-  auto const actual = tracer->GetUniqueParses();
+    TestSearchRequest request(m_engine, params);
+    request.Run();
+    Rules rules = {ExactMatch(id, regularCafe), ExactMatch(id, moscowCafe)};
+    TEST(ResultsMatch(request.Results(), rules), ());
 
-  vector<Tracer::Parse> const expected{
-      Tracer::Parse{{{TokenType::TOKEN_TYPE_POI, TokenRange(0, 2)}}, false /* category */},
-      Tracer::Parse{{{TokenType::TOKEN_TYPE_CITY, TokenRange(0, 1)},
-                     {TokenType::TOKEN_TYPE_POI, TokenRange(1, 2)}},
-                    true /* category */}};
+    auto const actual = tracer->GetUniqueParses();
 
-  TEST_EQUAL(expected, actual, ());
+    vector<Tracer::Parse> const expected{
+        Tracer::Parse{{{TokenType::TOKEN_TYPE_POI, TokenRange(0, 2)}}, false /* category */},
+        Tracer::Parse{{{TokenType::TOKEN_TYPE_CITY, TokenRange(0, 1)},
+                       {TokenType::TOKEN_TYPE_POI, TokenRange(1, 2)}},
+                      true /* category */}};
+
+    TEST_EQUAL(expected, actual, ());
+  }
+
+  {
+    params.m_query = "moscow tverskaya 1 or 2";
+    auto tracer = make_shared<Tracer>();
+    params.m_tracer = tracer;
+
+    TestSearchRequest request(m_engine, params);
+    request.Run();
+    TEST(ResultsMatch(request.Results(), {ExactMatch(id, tverskaya)}), ());
+
+    auto const actual = tracer->GetUniqueParses();
+    // Unrecognized tokens are not included into the parses.
+    vector<Tracer::Parse> const expected{
+        Tracer::Parse{{{TokenType::TOKEN_TYPE_STREET, TokenRange(1, 2)}}, false /* category */},
+        Tracer::Parse{{{TokenType::TOKEN_TYPE_CITY, TokenRange(0, 1)},
+                       {TokenType::TOKEN_TYPE_STREET, TokenRange(1, 2)}},
+                      false /* category */},
+    };
+
+    TEST_EQUAL(expected, actual, ());
+  }
 }
 }  // namespace
diff --git a/search/tracer.cpp b/search/tracer.cpp
index 3a6ee72a29..d59b068087 100644
--- a/search/tracer.cpp
+++ b/search/tracer.cpp
@@ -21,7 +21,8 @@ Tracer::Parse::Parse(vector<TokenType> const & types, bool category) : m_categor
     auto j = i + 1;
     while (j != types.size() && types[j] == type)
       ++j;
-    m_ranges[type] = TokenRange(i, j);
+    if (type < TokenType::TOKEN_TYPE_COUNT)
+      m_ranges[type] = TokenRange(i, j);
     i = j;
   }
 }