diff --git a/android/jni/com/mapswithme/maps/editor/Editor.cpp b/android/jni/com/mapswithme/maps/editor/Editor.cpp
index 68d958d045..75f9092ddc 100644
--- a/android/jni/com/mapswithme/maps/editor/Editor.cpp
+++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp
@@ -6,7 +6,7 @@
 #include "base/assert.hpp"
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
-#include "geometry/mercator.hpp"
+
 #include "indexer/cuisines.hpp"
 #include "indexer/editable_map_object.hpp"
 #include "indexer/osm_editor.hpp"
@@ -353,7 +353,7 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass
 JNIEXPORT void JNICALL
 Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon, jstring text)
 {
-  Editor::Instance().CreateNote(MercatorBounds::FromLatLon(lat, lon), jni::ToNativeString(env, text));
+  Editor::Instance().CreateNote(ms::LatLon(lat, lon), jni::ToNativeString(env, text));
 }
 
 } // extern "C"
diff --git a/editor/editor_notes.cpp b/editor/editor_notes.cpp
index b4c7bb6ee0..162e9f7d61 100644
--- a/editor/editor_notes.cpp
+++ b/editor/editor_notes.cpp
@@ -133,7 +133,7 @@ Notes::Notes(string const & fileName) : m_fileName(fileName)
   Load(m_fileName, m_notes, m_uploadedNotesCount);
 }
 
-void Notes::CreateNote(m2::PointD const & point, string const & text)
+void Notes::CreateNote(ms::LatLon const & latLon, string const & text)
 {
   if (text.empty())
   {
@@ -141,14 +141,14 @@ void Notes::CreateNote(m2::PointD const & point, string const & text)
     return;
   }
 
-  if (!MercatorBounds::ValidX(point.x) || !MercatorBounds::ValidY(point.y))
+  if (!MercatorBounds::ValidLat(latLon.lat) || !MercatorBounds::ValidLon(latLon.lon))
   {
-    LOG(LWARNING, ("A note attached to a wrong point", point));
+    LOG(LWARNING, ("A note attached to a wrong latLon", latLon));
     return;
   }
 
   lock_guard<mutex> g(m_mu);
-  m_notes.emplace_back(MercatorBounds::ToLatLon(point), text);
+  m_notes.emplace_back(latLon, text);
   Save(m_fileName, m_notes, m_uploadedNotesCount);
 }
 
diff --git a/editor/editor_notes.hpp b/editor/editor_notes.hpp
index 4cdf9607be..06c540c448 100644
--- a/editor/editor_notes.hpp
+++ b/editor/editor_notes.hpp
@@ -31,7 +31,7 @@ public:
   static shared_ptr<Notes> MakeNotes(string const & fileName = "notes.xml",
                                      bool const fullPath = false);
 
-  void CreateNote(m2::PointD const & point, string const & text);
+  void CreateNote(ms::LatLon const & latLon, string const & text);
 
   /// Uploads notes to the server in a separate thread.
   void Upload(osm::OsmOAuth const & auth);
diff --git a/editor/editor_tests/editor_notes_test.cpp b/editor/editor_tests/editor_notes_test.cpp
index 80845ccc59..a6b6496063 100644
--- a/editor/editor_tests/editor_notes_test.cpp
+++ b/editor/editor_tests/editor_notes_test.cpp
@@ -19,9 +19,9 @@ UNIT_TEST(Notes_Smoke)
   platform::tests_support::ScopedFile sf(fileName);
   {
     auto const notes = Notes::MakeNotes(fullFileName, true);
-    notes->CreateNote({1, 2}, "Some note1");
-    notes->CreateNote({2, 2}, "Some note2");
-    notes->CreateNote({1, 1}, "Some note3");
+    notes->CreateNote(MercatorBounds::ToLatLon({1, 2}), "Some note1");
+    notes->CreateNote(MercatorBounds::ToLatLon({2, 2}), "Some note2");
+    notes->CreateNote(MercatorBounds::ToLatLon({1, 1}), "Some note3");
   }
   {
     auto const notes = Notes::MakeNotes(fullFileName, true);
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index ad04b7f04b..9e1537f951 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -365,7 +365,7 @@ namespace
 {
 constexpr uint32_t kStartIndexForCreatedFeatures = numeric_limits<uint32_t>::max() - 0xfffff;
 }  // namespace
-  
+
 bool Editor::IsCreatedFeature(FeatureID const & fid)
 {
   return fid.m_index >= kStartIndexForCreatedFeatures;
@@ -863,9 +863,9 @@ bool Editor::CreatePoint(uint32_t type, m2::PointD const & mercator, MwmSet::Mwm
   return true;
 }
 
-void Editor::CreateNote(m2::PointD const & point, string const & note)
+void Editor::CreateNote(ms::LatLon const & latLon, string const & note)
 {
-  m_notes->CreateNote(point, note);
+  m_notes->CreateNote(latLon, note);
 }
 
 void Editor::UploadNotes(string const & key, string const & secret)
diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp
index 1cd83ae71d..f73df79d63 100644
--- a/indexer/osm_editor.hpp
+++ b/indexer/osm_editor.hpp
@@ -116,7 +116,7 @@ public:
 
   bool CreatePoint(uint32_t type, m2::PointD const & mercator, MwmSet::MwmId const & id, EditableMapObject & outFeature);
 
-  void CreateNote(m2::PointD const & point, string const & note);
+  void CreateNote(ms::LatLon const & latLon, string const & note);
   void UploadNotes(string const & key, string const & secret);
 
   struct Stats
@@ -127,7 +127,7 @@ public:
     time_t m_lastUploadTimestamp = my::INVALID_TIME_STAMP;
   };
   Stats GetStats() const;
-  
+
   static bool IsCreatedFeature(FeatureID const & fid);
 
 private:
diff --git a/iphone/Maps/Classes/MWMReportBaseController.mm b/iphone/Maps/Classes/MWMReportBaseController.mm
index 16b8f6c26d..8c74c2bff3 100644
--- a/iphone/Maps/Classes/MWMReportBaseController.mm
+++ b/iphone/Maps/Classes/MWMReportBaseController.mm
@@ -30,7 +30,7 @@
   NSAssert(!note.empty(), @"String can't be empty!");
   auto const & featureID = MapsAppDelegate.theApp.mapViewController.controlsManager.placePageEntity.info.GetID();
   auto const latLon = ToLatLon(m_point);
-  osm::Editor::Instance().CreateNote(m_point, note);
+  osm::Editor::Instance().CreateNote(latLon, note);
   [Statistics logEvent:kStatEditorProblemReport withParameters:@{kStatEditorMWMName : @(featureID.GetMwmName().c_str()),
                                                                  kStatEditorMWMVersion : @(featureID.GetMwmVersion()),
                                                                  kStatProblem : @(note.c_str()),