diff --git a/map/address_finder.cpp b/map/address_finder.cpp
index 157dc5a361..5c829db461 100644
--- a/map/address_finder.cpp
+++ b/map/address_finder.cpp
@@ -384,6 +384,9 @@ namespace
 
         if (info.m_name.empty())
         {
+          /// @todo Make logic better.
+          /// Now we skip linear objects to get only POI's here (don't mix with streets or roads).
+          /// But there are linear types that may be interesting for POI (rivers).
           if (m_cont[i].m_types.GetGeoType() != feature::GEOM_LINE)
           {
             info.m_name = m_cont[i].m_name;
diff --git a/yg/overlay_element.cpp b/yg/overlay_element.cpp
index 1e1d5b0ca6..a305457347 100644
--- a/yg/overlay_element.cpp
+++ b/yg/overlay_element.cpp
@@ -186,6 +186,10 @@ namespace yg
 
   m2::PointD const OverlayElement::point(EPosition pos) const
   {
+    /// @todo It's better to call roughBoundRect(), or place ASSERT(!m_isDirtyRoughRect, ()) here.
+    /// In general there is no need to store m_roughBoundRect at all.
+    /// It's calculating time is fast, because elements already cache vector<m2::AnyRectD>.
+
     m2::PointD res = m_roughBoundRect.Center();
 
     if (pos & EPosLeft)