diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index 6cbc55db90..c7d7bf9e08 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -519,17 +519,6 @@ bool FeatureBuilder1::HasOsmId(osm::Id const & id) const
   return false;
 }
 
-string FeatureBuilder1::GetOsmIdsString() const
-{
-  if (m_osmIds.empty())
-    return "(NOT AN OSM FEATURE)";
-
-  ostringstream out;
-  for (auto const & id : m_osmIds)
-    out << DebugPrint(id) << " ";
-  return out.str();
-}
-
 int FeatureBuilder1::GetMinFeatureDrawScale() const
 {
   int const minScale = feature::GetMinDrawableScale(GetFeatureBase());
diff --git a/generator/feature_builder.hpp b/generator/feature_builder.hpp
index 1f5d2213f1..16c3c41592 100644
--- a/generator/feature_builder.hpp
+++ b/generator/feature_builder.hpp
@@ -176,7 +176,6 @@ public:
   /// area's one if there is no relation, and relation id otherwise.
   osm::Id GetMostGenericOsmId() const;
   bool HasOsmId(osm::Id const & id) const;
-  std::string GetOsmIdsString() const;
   vector<osm::Id> const & GetOsmIds() const { return m_osmIds; }
   //@}
 
diff --git a/geocoder/geocoder.cpp b/geocoder/geocoder.cpp
index 9c931e9005..4fdb8483ec 100644
--- a/geocoder/geocoder.cpp
+++ b/geocoder/geocoder.cpp
@@ -14,13 +14,13 @@ void Geocoder::ProcessQuery(string const & query, vector<Result> & results) cons
   results.clear();
   if (query == "a")
   {
-    results.emplace_back(osm::Id(10), 0.5 /* certainty */);
-    results.emplace_back(osm::Id(11), 1.0 /* certainty */);
+    results.emplace_back(osm::Id(0xC00000000026FCFDULL), 0.5 /* certainty */);
+    results.emplace_back(osm::Id(0x40000000C4D63818ULL), 1.0 /* certainty */);
   }
   if (query == "b")
   {
-    results.emplace_back(osm::Id(20), 0.8 /* certainty */);
-    results.emplace_back(osm::Id(21), 0.1 /* certainty */);
+    results.emplace_back(osm::Id(0x8000000014527125ULL), 0.8 /* certainty */);
+    results.emplace_back(osm::Id(0x40000000F26943B9ULL), 0.1 /* certainty */);
   }
 }
 }  // namespace geocoder
diff --git a/geocoder/geocoder_tests/geocoder_tests.cpp b/geocoder/geocoder_tests/geocoder_tests.cpp
index 90be70115b..934b18ae38 100644
--- a/geocoder/geocoder_tests/geocoder_tests.cpp
+++ b/geocoder/geocoder_tests/geocoder_tests.cpp
@@ -2,7 +2,6 @@
 
 #include "geocoder/geocoder.hpp"
 
-#include "base/logging.hpp"
 #include "base/math.hpp"
 
 #include <string>
@@ -33,7 +32,9 @@ UNIT_TEST(Geocoder_Smoke)
 {
   Geocoder geocoder("" /* pathToJsonHierarchy */);
 
-  TestGeocoder(geocoder, "a", {{osm::Id(10), 0.5}, {osm::Id(11), 1.0}});
-  TestGeocoder(geocoder, "b", {{osm::Id(20), 0.8}, {osm::Id(21), 0.1}});
+  TestGeocoder(geocoder, "a",
+               {{osm::Id(0xC00000000026FCFDULL), 0.5}, {osm::Id(0x40000000C4D63818ULL), 1.0}});
+  TestGeocoder(geocoder, "b",
+               {{osm::Id(0x8000000014527125ULL), 0.8}, {osm::Id(0x40000000F26943B9ULL), 0.1}});
 }
 }  // namespace geocoder