diff --git a/generator/descriptions_section_builder.cpp b/generator/descriptions_section_builder.cpp
index 68f74e93a2..b5150090cb 100644
--- a/generator/descriptions_section_builder.cpp
+++ b/generator/descriptions_section_builder.cpp
@@ -1,6 +1,6 @@
 #include "generator/descriptions_section_builder.hpp"
 
-#include "generator/routing_helpers.hpp"
+#include "generator/utils.hpp"
 
 #include "platform/platform.hpp"
 
@@ -35,7 +35,7 @@ WikidataHelper::WikidataHelper(std::string const & mwmPath, std::string const &
   , m_idToWikidataPath(idToWikidataPath)
 {
   std::string const osmIdsToFeatureIdsPath = m_mwmPath + OSM2FEATURE_FILE_EXTENSION;
-  if (!routing::ParseRoadsFeatureIdToOsmIdMapping(osmIdsToFeatureIdsPath, m_featureIdToOsmId))
+  if (!ParseFeatureIdToOsmIdMapping(osmIdsToFeatureIdsPath, m_featureIdToOsmId))
     LOG(LCRITICAL, ("Error parse OsmIdToFeatureId mapping."));
 
   std::ifstream stream;
@@ -55,10 +55,11 @@ WikidataHelper::WikidataHelper(std::string const & mwmPath, std::string const &
 boost::optional<std::string> WikidataHelper::GetWikidataId(uint32_t featureId) const
 {
   auto const itFeatureIdToOsmId = m_featureIdToOsmId.find(featureId);
-  if (itFeatureIdToOsmId == std::end(m_featureIdToOsmId))
+  if (itFeatureIdToOsmId == std::end(m_featureIdToOsmId) || itFeatureIdToOsmId->second.size() == 0)
     return {};
 
-  auto const itOsmIdToWikidataId = m_osmIdToWikidataId.find(itFeatureIdToOsmId->second);
+  auto const osmId = itFeatureIdToOsmId->second[0];
+  auto const itOsmIdToWikidataId = m_osmIdToWikidataId.find(osmId);
   return itOsmIdToWikidataId == std::end(m_osmIdToWikidataId) ?
         boost::optional<std::string>() : itOsmIdToWikidataId->second;
 }
diff --git a/generator/descriptions_section_builder.hpp b/generator/descriptions_section_builder.hpp
index 3694586d24..15450c9856 100644
--- a/generator/descriptions_section_builder.hpp
+++ b/generator/descriptions_section_builder.hpp
@@ -24,6 +24,7 @@
 #include <map>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include <boost/optional.hpp>
 
@@ -45,7 +46,7 @@ public:
 private:
   std::string m_mwmPath;
   std::string m_idToWikidataPath;
-  std::map<uint32_t, base::GeoObjectId> m_featureIdToOsmId;
+  std::map<uint32_t, std::vector<base::GeoObjectId>> m_featureIdToOsmId;
   std::map<base::GeoObjectId, std::string> m_osmIdToWikidataId;
 };