diff --git a/editor/changeset_wrapper.cpp b/editor/changeset_wrapper.cpp
index 8e6f712301..467d3dd6d6 100644
--- a/editor/changeset_wrapper.cpp
+++ b/editor/changeset_wrapper.cpp
@@ -18,8 +18,6 @@ using editor::XMLFeature;
 
 namespace
 {
-constexpr char const * kInitialChangesetComment = "Edits via MAPS.ME app, a partial upload";
-
 m2::RectD GetBoundingRect(vector<m2::PointD> const & geometry)
 {
   m2::RectD rect;
@@ -36,9 +34,9 @@ bool OsmFeatureHasTags(pugi::xml_node const & osmFt)
   return osmFt.child("tag");
 }
 
-vector<string> const static kMainTags = {
-    "amenity", "shop",    "tourism",  "historic", "craft", "emergency", "barrier",  "highway",
-    "office",  "leisure", "waterway", "natural",  "place", "entrance",  "building", "name"};
+vector<string> const static kMainTags = {"amenity", "shop",      "tourism", "historic",
+                                         "craft",   "emergency", "barrier", "highway",
+                                         "office",  "entrance",  "building"};
 
 string GetTypeForFeature(XMLFeature const & node)
 {
@@ -103,7 +101,6 @@ ChangesetWrapper::ChangesetWrapper(TKeySecret const & keySecret,
     : m_changesetComments(comments),
       m_api(OsmOAuth::ServerAuth(keySecret))
 {
-  m_changesetComments["comment"] = kInitialChangesetComment;
 }
 
 ChangesetWrapper::~ChangesetWrapper()
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index 414a649981..9d7a9ee6f0 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -965,7 +965,7 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
     case NoteProblemType::PlaceDoesNotExist:
       sstr << kPlaceDoesNotExistMessage;
       if (!note.empty())
-        sstr << "\n\nUser comments: " << note << "\n\n";
+        sstr << " User comments: \"" << note << '\"';
       break;
     case NoteProblemType::General:
       sstr << note;
@@ -993,5 +993,5 @@ string DebugPrint(Editor::FeatureStatus fs)
   };
 }
 
-const char * const Editor::kPlaceDoesNotExistMessage = "The place has gone or never existed.\n\nThis is an auto-generated note from MAPS.ME application: a user reports a POI that is visible on a map (which can be outdated), but cannot be found on the ground.";
+const char * const Editor::kPlaceDoesNotExistMessage = "The place has gone or never existed. This is an auto-generated note from MAPS.ME application: a user reports a POI that is visible on a map (which can be outdated), but cannot be found on the ground.";
 }  // namespace osm