diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp
index a89c30c308..ebb7c7b109 100644
--- a/indexer/osm_editor.hpp
+++ b/indexer/osm_editor.hpp
@@ -30,6 +30,7 @@ class Editor final
 public:
   using TMwmIdByMapNameFn = function<MwmSet::MwmId(string const & /*map*/)>;
   using TInvalidateFn = function<void()>;
+  using TFeatureLoaderFn = function<FeatureType (FeatureID const & /*fid*/)>;
 
   enum FeatureStatus
   {
@@ -46,6 +47,7 @@ public:
 
   void SetMwmIdByNameAndVersionFn(TMwmIdByMapNameFn const & fn) { m_mwmIdByMapNameFn = fn; }
   void SetInvalidateFn(TInvalidateFn const & fn) { m_invalidateFn = fn; }
+  void SetFeatureLoaderFn(TFeatureLoaderFn const & fn) { m_featureLoaderFn = fn; }
 
   void LoadMapEdits();
 
@@ -102,6 +104,7 @@ private:
   TMwmIdByMapNameFn m_mwmIdByMapNameFn;
   /// Invalidate map viewport after edits.
   TInvalidateFn m_invalidateFn;
+  TFeatureLoaderFn m_featureLoaderFn;
 };  // class Editor
 
 }  // namespace osm
diff --git a/map/framework.cpp b/map/framework.cpp
index d65c19100a..42f247c981 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -328,6 +328,10 @@ Framework::Framework()
     return m_model.GetIndex().GetMwmIdByCountryFile(platform::CountryFile(name));
   });
   editor.SetInvalidateFn([this](){ InvalidateRect(GetCurrentViewport()); });
+  editor.SetFeatureLoaderFn([this](FeatureID const & fid) -> FeatureType
+  {
+    return GetPOIByID(fid);
+  });
   editor.LoadMapEdits();
 }