diff --git a/indexer/index.hpp b/indexer/index.hpp
index 569e94ff37..dfa18a1e54 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -91,7 +91,7 @@ private:
 
         for (auto const & i : intervals)
         {
-          index.ForEachInIntervalAndScale(
+          index.ForEachInIntervalAndScale(i.first, i.second, scale,
               [&](uint32_t index)
               {
                 if (!checkUnique(index))
@@ -115,8 +115,7 @@ private:
                 fv.GetByIndex(index, feature);
                 feature.SetID(FeatureID(mwmID, index));
                 m_f(feature);
-              },
-              i.first, i.second, scale);
+              });
         }
       }
     }
@@ -159,15 +158,14 @@ private:
 
         for (auto const & i : intervals)
         {
-          index.ForEachInIntervalAndScale(
+          index.ForEachInIntervalAndScale(i.first, i.second, scale,
               [&](uint32_t index)
               {
                 if (datasource::FeatureStatus::Deleted !=
                         m_editor.GetFeatureStatus(mwmID, index) &&
                     checkUnique(index))
                   m_f(FeatureID(mwmID, index));
-              },
-              i.first, i.second, scale);
+              });
         }
       }
     }
diff --git a/indexer/indexer_tests/scale_index_reading_tests.cpp b/indexer/indexer_tests/scale_index_reading_tests.cpp
index 98c44c1d21..93cd257128 100644
--- a/indexer/indexer_tests/scale_index_reading_tests.cpp
+++ b/indexer/indexer_tests/scale_index_reading_tests.cpp
@@ -52,8 +52,8 @@ public:
     vector<uint32_t> indices;
     for (auto const & interval : covering.Get<RectId::DEPTH_LEVELS>(scale))
     {
-      index.ForEachInIntervalAndScale([&](uint32_t index) { indices.push_back(index); },
-                                      interval.first, interval.second, scale);
+      index.ForEachInIntervalAndScale(interval.first, interval.second, scale,
+                                      [&](uint32_t index) { indices.push_back(index); });
     }
 
     Index::FeaturesLoaderGuard loader(m_index, id);
diff --git a/indexer/scale_index.hpp b/indexer/scale_index.hpp
index 096f00c200..b1ccd16eb9 100644
--- a/indexer/scale_index.hpp
+++ b/indexer/scale_index.hpp
@@ -52,14 +52,13 @@ public:
       m_IndexForScale.push_back(factory.CreateIndex(treesReader.SubReader(i)));
   }
 
-  template <typename F>
-  void ForEachInIntervalAndScale(F const & f, uint64_t beg, uint64_t end, int scale) const
+  void ForEachInIntervalAndScale(uint64_t beg, uint64_t end, int scale, std::function<void(uint32_t)> const & fn) const
   {
     auto const scaleBucket = BucketByScale(scale);
     if (scaleBucket < m_IndexForScale.size())
     {
       for (size_t i = 0; i <= scaleBucket; ++i)
-        m_IndexForScale[i]->ForEach(f, beg, end);
+        m_IndexForScale[i]->ForEach(fn, beg, end);
     }
   }
 
diff --git a/search/mwm_context.hpp b/search/mwm_context.hpp
index 77e90262c1..73ed83be06 100644
--- a/search/mwm_context.hpp
+++ b/search/mwm_context.hpp
@@ -92,13 +92,12 @@ private:
   {
     CheckUniqueIndexes checkUnique(m_value.GetHeader().GetFormat() >= version::Format::v5);
     for (auto const & i : intervals)
-      m_index.ForEachInIntervalAndScale(
+      m_index.ForEachInIntervalAndScale(i.first, i.second, scale,
           [&](uint32_t index)
           {
             if (checkUnique(index))
               fn(index);
-          },
-          i.first, i.second, scale);
+          });
   }
 
   FeaturesVector m_vector;