diff --git a/android/jni/app/organicmaps/Framework.cpp b/android/jni/app/organicmaps/Framework.cpp
index 34c64a2835..ac5ad0a6af 100644
--- a/android/jni/app/organicmaps/Framework.cpp
+++ b/android/jni/app/organicmaps/Framework.cpp
@@ -1106,14 +1106,8 @@ Java_app_organicmaps_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass)
 JNIEXPORT jobjectArray JNICALL
 Java_app_organicmaps_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jclass)
 {
-  static std::array<std::string, 4> const kBookmarkExtensions = {
-    std::string{kKmzExtension},
-    std::string{kKmlExtension},
-    std::string{kKmbExtension},
-    std::string{kGpxExtension}
-  };
-
-  return jni::ToJavaStringArray(env, kBookmarkExtensions);
+  const vector<string> exts = { kKmzExtension, kKmlExtension, kKmbExtension, kGpxExtension };
+  return jni::ToJavaStringArray(env, exts);
 }
 
 JNIEXPORT void JNICALL
diff --git a/data/gpx_test_data/color.gpx b/data/gpx_test_data/color.gpx
index 56a81bef96..0de2801302 100644
--- a/data/gpx_test_data/color.gpx
+++ b/data/gpx_test_data/color.gpx
@@ -77,4 +77,35 @@
     </trkpt>
     </trkseg>
 </trk>
+
+<trk>
+    <name>black</name>
+    <extensions>
+      <gpxx:TrackExtension xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
+        <gpxx:DisplayColor>Black</gpxx:DisplayColor>
+      </gpxx:TrackExtension>
+    </extensions>
+    <trkseg>
+      <trkpt lat="48.766598" lon="-3.5625">
+        <ele>75.59999</ele>
+        <time>2013-03-08T09:05:06Z</time>
+      </trkpt>
+    </trkseg>
+</trk>
+
+<trk>
+    <name>reset to red</name>
+    <extensions>
+      <gpxx:TrackExtension xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
+        <gpxx:DisplayColor>UnussportedGarminColor</gpxx:DisplayColor>
+      </gpxx:TrackExtension>
+    </extensions>
+    <trkseg>
+      <trkpt lat="48.766598" lon="-3.5625">
+        <ele>75.59999</ele>
+        <time>2013-03-08T09:05:06Z</time>
+      </trkpt>
+    </trkseg>
+</trk>
+
 </gpx>
\ No newline at end of file
diff --git a/docs/DEBUG_COMMANDS.md b/docs/DEBUG_COMMANDS.md
index ae8d261505..d37d4ee060 100644
--- a/docs/DEBUG_COMMANDS.md
+++ b/docs/DEBUG_COMMANDS.md
@@ -27,13 +27,6 @@ For more information, please see the source code at [`Framework::ParseSearchQuer
 - `?isolines`: Enable the isolines layer.
 - `?no-isolines`: Disable the isolines layer.
 
-### 3D mode (for the Qt desktop app only)
-- `?3d`: Enable 3D (perspective) mode.
-- `?b3d`: Enable 3D buildings.
-- `?2d`: Disable 3D mode and buildings.
-
-The source code is at [`SearchPanel::Try3dModeCmd`](../qt/search_panel.cpp).
-
 ### Information
 
 - `?debug-info`: Show renderer version, zoom scale and FPS counter in the top left corner of the map.
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index ff8b4f3e53..6f99e547ee 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -130,7 +130,7 @@ sudo dnf install -y \
     freetype-devel \
     libicu-devel \
     libstdc++-devel \
-    mesa-libGL-devel \
+    libgl1-mesa-devel \
     libglvnd-devel \
     qt6-qtbase-devel \
     qt6-qtsvg-devel \
@@ -268,7 +268,7 @@ To switch themes you can enter this commands:
 - `?vlight` - Day theme for vehicle navigation
 - `?vdark` - Night theme for vehicle navigation
 
-There are also other commands for turning on/off isolines, antialiasing, etc. Check [DEBUG_COMMANDS.md](DEBUG_COMMANDS.md) to learn about them.
+There are also other commands for turning on/off isolines, antialiasing, etc. Check [the code](https://github.com/organicmaps/organicmaps/blob/6ae19b40c2b7a515338eb128547df05da13bdb78/map/framework.cpp#L2570-L2671) to learn about them.
 
 ### More options
 
diff --git a/drape_frontend/area_shape.cpp b/drape_frontend/area_shape.cpp
index ff702c0a72..46c94e5cc1 100644
--- a/drape_frontend/area_shape.cpp
+++ b/drape_frontend/area_shape.cpp
@@ -41,10 +41,7 @@ void AreaShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher>
   }
 
   if (m_params.m_is3D)
-  {
-    if (m_vertexes.size() < 10000)
-      DrawArea3D(context, batcher, colorUv, outlineUv, region.GetTexture());
-  }
+    DrawArea3D(context, batcher, colorUv, outlineUv, region.GetTexture());
   else if (m_params.m_hatching)
     DrawHatchingArea(context, batcher, colorUv, region.GetTexture(), textures->GetHatchingTexture());
   else
diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp
index 6f127ce92b..43216af1a9 100644
--- a/drape_frontend/backend_renderer.cpp
+++ b/drape_frontend/backend_renderer.cpp
@@ -695,9 +695,7 @@ void BackendRenderer::RenderFrame()
 
 void BackendRenderer::InitContextDependentResources()
 {
-  // Increase this value for big features.
   uint32_t constexpr kBatchSize = 5000;
-
   m_batchersPool = make_unique_dp<BatchersPool<TileKey, TileKeyStrictComparator>>(kReadingThreadsCount,
                                                std::bind(&BackendRenderer::FlushGeometry, this, _1, _2, _3),
                                                kBatchSize, kBatchSize);
diff --git a/indexer/caching_rank_table_loader.cpp b/indexer/caching_rank_table_loader.cpp
index e540c7a797..dbaa3627ba 100644
--- a/indexer/caching_rank_table_loader.cpp
+++ b/indexer/caching_rank_table_loader.cpp
@@ -3,7 +3,14 @@
 #include "search/dummy_rank_table.hpp"
 
 #include "indexer/data_source.hpp"
+#include "indexer/feature.hpp"
 
+#include "defines.hpp"
+
+namespace
+{
+uint8_t const kNoRank = 0;
+}  // namespace
 
 CachingRankTableLoader::CachingRankTableLoader(DataSource const & dataSource,
                                                std::string const & sectionName)
@@ -16,7 +23,7 @@ uint8_t CachingRankTableLoader::Get(FeatureID const & featureId) const
   auto const handle = m_dataSource.GetMwmHandleById(featureId.m_mwmId);
 
   if (!handle.IsAlive())
-    return search::RankTable::kNoRank;
+    return kNoRank;
 
   auto it = m_deserializers.find(featureId.m_mwmId);
 
diff --git a/indexer/caching_rank_table_loader.hpp b/indexer/caching_rank_table_loader.hpp
index c8dc5d5b40..2e80429ae7 100644
--- a/indexer/caching_rank_table_loader.hpp
+++ b/indexer/caching_rank_table_loader.hpp
@@ -6,6 +6,7 @@
 
 #include "base/macros.hpp"
 
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
@@ -19,14 +20,13 @@ class CachingRankTableLoader
 public:
   CachingRankTableLoader(DataSource const & dataSource, std::string const & sectionName);
 
-  /// @return 0 if there is no rank for feature.
   uint8_t Get(FeatureID const & featureId) const;
   void OnMwmDeregistered(platform::LocalCountryFile const & localFile);
 
 private:
   DataSource const & m_dataSource;
   std::string const m_sectionName;
-  mutable std::map<MwmSet::MwmId, std::unique_ptr<search::RankTable>> m_deserializers;
+  mutable std::map<MwmSet::MwmId, std::unique_ptr<search::RankTable const> const> m_deserializers;
 
   DISALLOW_COPY(CachingRankTableLoader);
 };
diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index ecf1926bb2..8c065b6990 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -346,16 +346,16 @@ IsWayChecker::IsWayChecker()
       {"primary",       Regular},
       {"primary_link",  Regular},
       {"residential",   Residential},
-      {"road",          Minors},
+      {"road",          Outdoor},
       {"secondary",     Regular},
       {"secondary_link",Regular},
-      {"service",       Minors},
+      {"service",       Residential},
       {"tertiary",      Regular},
       {"tertiary_link", Regular},
       {"track",         Outdoor},
       {"trunk",         Motorway},
       {"trunk_link",    Motorway},
-      {"unclassified",  Minors},
+      {"unclassified",  Outdoor},
   };
 
   m_ranks.Reserve(std::size(types));
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index c4611a541b..65eb507c9f 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -222,7 +222,6 @@ public:
     Pedestrian,
     Cycleway,
     Outdoor,
-    Minors,
     Residential,
     Regular,
     Motorway,
diff --git a/indexer/indexer_tests/rank_table_test.cpp b/indexer/indexer_tests/rank_table_test.cpp
index 07a4287011..879c33dc86 100644
--- a/indexer/indexer_tests/rank_table_test.cpp
+++ b/indexer/indexer_tests/rank_table_test.cpp
@@ -85,7 +85,8 @@ UNIT_TEST(RankTableBuilder_EndToEnd)
   base::CopyFileX(originalMapPath, mapPath);
   SCOPE_GUARD(cleanup, bind(&FileWriter::DeleteFileX, mapPath));
 
-  auto const localFile = platform::LocalCountryFile::MakeForTesting("minsk-pass-copy");
+  platform::LocalCountryFile localFile =
+      platform::LocalCountryFile::MakeForTesting("minsk-pass-copy");
   TEST(localFile.OnDisk(MapFileType::Map), ());
 
   vector<uint8_t> ranks;
@@ -105,3 +106,57 @@ UNIT_TEST(RankTableBuilder_EndToEnd)
 
   TestTable(ranks, mapPath);
 }
+
+UNIT_TEST(RankTableBuilder_WrongEndianness)
+{
+  char const kTestFile[] = "test.mwm";
+  SCOPE_GUARD(cleanup, bind(&FileWriter::DeleteFileX, kTestFile));
+
+  vector<uint8_t> ranks = {0, 1, 2, 3, 4};
+  {
+    FilesContainerW wcont(kTestFile);
+    search::RankTableBuilder::Create(ranks, wcont, SEARCH_RANKS_FILE_TAG);
+  }
+
+  // Load rank table in host endianness.
+  unique_ptr<search::RankTable> table;
+  {
+    FilesContainerR rcont(kTestFile);
+    table = search::RankTable::Load(rcont, SEARCH_RANKS_FILE_TAG);
+    TEST(table.get(), ());
+    TestTable(ranks, *table);
+  }
+
+  // Serialize rank table in opposite endianness.
+  {
+    vector<char> data;
+    {
+      MemWriter<decltype(data)> writer(data);
+      table->Serialize(writer, false /* preserveHostEndianness */);
+    }
+
+    FilesContainerW wcont(kTestFile);
+    wcont.Write(data, SEARCH_RANKS_FILE_TAG);
+  }
+
+  // Try to load rank table from opposite endianness.
+  {
+    FilesContainerR rcont(kTestFile);
+    auto table = search::RankTable::Load(rcont, SEARCH_RANKS_FILE_TAG);
+    TEST(table.get(), ());
+    TestTable(ranks, *table);
+  }
+
+  // It's impossible to map rank table from opposite endianness.
+  {
+    FilesMappingContainer mcont(kTestFile);
+    auto table = search::RankTable::Load(mcont, SEARCH_RANKS_FILE_TAG);
+    TEST(!table.get(), ());
+  }
+
+  // Try to re-create rank table in test file.
+  TEST(search::SearchRankTableBuilder::CreateIfNotExists(kTestFile), ());
+
+  // Try to load and map rank table - both methods should work now.
+  TestTable(ranks, kTestFile);
+}
diff --git a/indexer/rank_table.cpp b/indexer/rank_table.cpp
index 348e05d00a..d7511fbf6e 100644
--- a/indexer/rank_table.cpp
+++ b/indexer/rank_table.cpp
@@ -1,10 +1,17 @@
 #include "indexer/rank_table.hpp"
 
+#include "indexer/classificator.hpp"
 #include "indexer/data_header.hpp"
+#include "indexer/feature_algo.hpp"
 #include "indexer/feature_impl.hpp"
+#include "indexer/feature_utils.hpp"
 #include "indexer/features_vector.hpp"
 #include "indexer/ftypes_matcher.hpp"
 
+#include "platform/local_country_file.hpp"
+#include "platform/local_country_file_utils.hpp"
+
+#include "coding/endianness.hpp"
 #include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
 #include "coding/memory_region.hpp"
@@ -13,30 +20,54 @@
 #include "coding/succinct_mapper.hpp"
 #include "coding/writer.hpp"
 
-#include "base/exception.hpp"
+#include "base/assert.hpp"
 #include "base/logging.hpp"
+#include "base/macros.hpp"
+#include "base/math.hpp"
 
 #include <algorithm>
+#include <exception>
 #include <limits>
+#include <utility>
 
 #include "defines.hpp"
 
+using namespace std;
 
 namespace search
 {
-using namespace std;
-
 namespace
 {
-size_t constexpr kVersionOffset = 0;
-size_t constexpr kHeaderSize = 8;
+uint64_t const kVersionOffset = 0;
+uint64_t const kFlagsOffset = 1;
+uint64_t const kHeaderSize = 8;
+
+enum class CheckResult
+{
+  CorruptedHeader,
+  EndiannessMismatch,
+  EndiannessMatch
+};
+
+template <typename TReader>
+CheckResult CheckEndianness(TReader && reader)
+{
+  if (reader.Size() < kHeaderSize)
+    return CheckResult::CorruptedHeader;
+  uint8_t flags;
+  reader.Read(kFlagsOffset, &flags, sizeof(flags));
+  bool const isHostBigEndian = IsBigEndianMacroBased();
+  bool const isDataBigEndian = flags & 1;
+  if (isHostBigEndian != isDataBigEndian)
+    return CheckResult::EndiannessMismatch;
+  return CheckResult::EndiannessMatch;
+}
 
 unique_ptr<CopiedMemoryRegion> GetMemoryRegionForTag(FilesContainerR const & rcont,
                                                      FilesContainerBase::Tag const & tag)
 {
   if (!rcont.IsExist(tag))
-    return {};
-
+    return unique_ptr<CopiedMemoryRegion>();
   FilesContainerR::TReader reader = rcont.GetReader(tag);
   vector<uint8_t> buffer(static_cast<size_t>(reader.Size()));
   reader.Read(0, buffer.data(), buffer.size());
@@ -47,13 +78,13 @@ unique_ptr<MappedMemoryRegion> GetMemoryRegionForTag(FilesMappingContainer const
                                                      FilesContainerBase::Tag const & tag)
 {
   if (!mcont.IsExist(tag))
-    return {};
-
+    return unique_ptr<MappedMemoryRegion>();
   FilesMappingContainer::Handle handle = mcont.Map(tag);
   return make_unique<MappedMemoryRegion>(std::move(handle));
 }
 
-// RankTable version 0, uses simple dense coding to store and access array of ranks.
+// RankTable version 1, uses simple dense coding to store and access
+// array of ranks.
 class RankTableV0 : public RankTable
 {
 public:
@@ -68,7 +99,7 @@ public:
     // May be there is a better way to inject this code. Without this check search engine crashes here.
     //ASSERT_LESS(i, Size(), ());
     if (i >= Size())
-      return kNoRank;
+      return 0;
 
     return m_coding.Get(i);
   }
@@ -76,23 +107,60 @@ public:
   RankTable::Version GetVersion() const override { return V0; }
   void Serialize(Writer & writer, bool preserveHostEndianness) override
   {
+    static uint64_t const padding = 0;
+
     uint8_t const version = GetVersion();
-    size_t constexpr kVersionSize = sizeof(version);
-    writer.Write(&version, kVersionSize);
-
-    uint64_t const padding = 0;
-    static_assert(kHeaderSize % 8 == 0);  // next succinct vector should be aligned
-    writer.Write(&padding, kHeaderSize - kVersionSize);
-
-    Freeze(m_coding, writer, "SimpleDenseCoding");
+    uint8_t const flags = preserveHostEndianness ? IsBigEndianMacroBased() : !IsBigEndianMacroBased();
+    writer.Write(&version, sizeof(version));
+    writer.Write(&flags, sizeof(flags));
+    writer.Write(&padding, 6);
+    if (preserveHostEndianness)
+      Freeze(m_coding, writer, "SimpleDenseCoding");
+    else
+      ReverseFreeze(m_coding, writer, "SimpleDenseCoding");
   }
 
   // Loads RankTableV0 from a raw memory region.
-  template <class TRegion> static unique_ptr<RankTableV0> Load(unique_ptr<TRegion> && region)
+  static unique_ptr<RankTableV0> Load(unique_ptr<MappedMemoryRegion> && region)
   {
+    if (!region.get())
+      return unique_ptr<RankTableV0>();
+
+    auto const result =
+        CheckEndianness(MemReader(region->ImmutableData(), static_cast<size_t>(region->Size())));
+    if (result != CheckResult::EndiannessMatch)
+      return unique_ptr<RankTableV0>();
+
     auto table = make_unique<RankTableV0>();
+    coding::Map(table->m_coding, region->ImmutableData() + kHeaderSize, "SimpleDenseCoding");
     table->m_region = std::move(region);
-    coding::Map(table->m_coding, table->m_region->ImmutableData() + kHeaderSize, "SimpleDenseCoding");
+    return table;
+  }
+
+  // Loads RankTableV0 from a raw memory region. Modifies region in
+  // the case of endianness mismatch.
+  static unique_ptr<RankTableV0> Load(unique_ptr<CopiedMemoryRegion> && region)
+  {
+    if (!region.get())
+      return unique_ptr<RankTableV0>();
+
+    unique_ptr<RankTableV0> table;
+    switch (
+        CheckEndianness(MemReader(region->ImmutableData(), static_cast<size_t>(region->Size()))))
+    {
+    case CheckResult::CorruptedHeader:
+      break;
+    case CheckResult::EndiannessMismatch:
+      table.reset(new RankTableV0());
+      coding::ReverseMap(table->m_coding, region->MutableData() + kHeaderSize, "SimpleDenseCoding");
+      table->m_region = std::move(region);
+      break;
+    case CheckResult::EndiannessMatch:
+      table.reset(new RankTableV0());
+      coding::Map(table->m_coding, region->ImmutableData() + kHeaderSize, "SimpleDenseCoding");
+      table->m_region = std::move(region);
+      break;
+    }
     return table;
   }
 
@@ -108,6 +176,7 @@ void SerializeRankTable(RankTable & table, FilesContainerW & wcont, string const
 {
   if (wcont.IsExist(sectionName))
     wcont.DeleteSection(sectionName);
+  ASSERT(!wcont.IsExist(sectionName), ());
 
   vector<char> buffer;
   {
@@ -148,22 +217,77 @@ unique_ptr<RankTable> LoadRankTable(unique_ptr<TRegion> && region)
   return {};
 }
 
+uint8_t CalcEventRank(FeatureType & /*ft*/)
+{
+  //TODO: add custom event processing, i.e. fc2018.
+  return 0;
+}
+
+uint8_t CalcTransportRank(FeatureType & ft)
+{
+  uint8_t const kTransportRank = 2;
+  if (ftypes::IsRailwayStationChecker::Instance()(ft) ||
+      ftypes::IsSubwayStationChecker::Instance()(ft) || ftypes::IsAirportChecker::Instance()(ft))
+  {
+    return kTransportRank;
+  }
+
+  return 0;
+}
+
 // Calculates search rank for a feature.
 uint8_t CalcSearchRank(FeatureType & ft)
 {
-  return feature::PopulationToRank(ftypes::GetPopulation(ft));
+  auto const eventRank = CalcEventRank(ft);
+  auto const transportRank = CalcTransportRank(ft);
+  auto const populationRank = feature::PopulationToRank(ftypes::GetPopulation(ft));
+
+  return base::Clamp(eventRank + transportRank + populationRank, 0,
+                     static_cast<int>(numeric_limits<uint8_t>::max()));
 }
 
 // Creates rank table if it does not exists in |rcont| or has wrong
-// endianness. Otherwise (table exists and has correct format) returns null.
+// endianness. Otherwise (table exists and has correct format) returns
+// null.
 unique_ptr<RankTable> CreateSearchRankTableIfNotExists(FilesContainerR & rcont)
 {
-  if (rcont.IsExist(SEARCH_RANKS_FILE_TAG))
-    return {};
+  unique_ptr<RankTable> table;
 
-  vector<uint8_t> ranks;
-  SearchRankTableBuilder::CalcSearchRanks(rcont, ranks);
-  return make_unique<RankTableV0>(ranks);
+  if (rcont.IsExist(SEARCH_RANKS_FILE_TAG))
+  {
+    switch (CheckEndianness(rcont.GetReader(SEARCH_RANKS_FILE_TAG)))
+    {
+    case CheckResult::CorruptedHeader:
+    {
+      // Worst case - we need to create rank table from scratch.
+      break;
+    }
+    case CheckResult::EndiannessMismatch:
+    {
+      // Try to copy whole serialized data and instantiate table via
+      // reverse mapping.
+      auto region = GetMemoryRegionForTag(rcont, SEARCH_RANKS_FILE_TAG);
+      table = LoadRankTable(std::move(region));
+      break;
+    }
+    case CheckResult::EndiannessMatch:
+    {
+      // Table exists and has proper format. Nothing to do here.
+      return unique_ptr<RankTable>();
+    }
+    }
+  }
+
+  // Table doesn't exist or has wrong format. It's better to create it
+  // from scratch.
+  if (!table)
+  {
+    vector<uint8_t> ranks;
+    SearchRankTableBuilder::CalcSearchRanks(rcont, ranks);
+    table = make_unique<RankTableV0>(ranks);
+  }
+
+  return table;
 }
 }  // namespace
 
@@ -189,6 +313,37 @@ void SearchRankTableBuilder::CalcSearchRanks(FilesContainerR & rcont, vector<uin
       [&ranks](FeatureType & ft, uint32_t /* index */) { ranks.push_back(CalcSearchRank(ft)); });
 }
 
+// static
+bool SearchRankTableBuilder::CreateIfNotExists(platform::LocalCountryFile const & localFile) noexcept
+{
+  try
+  {
+    string mapPath;
+
+    unique_ptr<RankTable> table;
+    {
+      ModelReaderPtr reader = platform::GetCountryReader(localFile, MapFileType::Map);
+      if (!reader.GetPtr())
+        return false;
+
+      mapPath = reader.GetName();
+
+      FilesContainerR rcont(reader);
+      table = CreateSearchRankTableIfNotExists(rcont);
+    }
+
+    if (table)
+      SerializeRankTable(*table, mapPath, SEARCH_RANKS_FILE_TAG);
+
+    return true;
+  }
+  catch (exception & e)
+  {
+    LOG(LWARNING, ("Can' create rank table for:", localFile, ":", e.what()));
+    return false;
+  }
+}
+
 // static
 bool SearchRankTableBuilder::CreateIfNotExists(string const & mapPath) noexcept
 {
@@ -205,7 +360,7 @@ bool SearchRankTableBuilder::CreateIfNotExists(string const & mapPath) noexcept
 
     return true;
   }
-  catch (RootException const & e)
+  catch (exception & e)
   {
     LOG(LWARNING, ("Can' create rank table for:", mapPath, ":", e.what()));
     return false;
diff --git a/indexer/rank_table.hpp b/indexer/rank_table.hpp
index 7a26a2fa86..6f2a19886c 100644
--- a/indexer/rank_table.hpp
+++ b/indexer/rank_table.hpp
@@ -48,8 +48,7 @@ public:
 
   virtual ~RankTable() = default;
 
-  static uint8_t constexpr kNoRank = 0;
-  /// @return rank of the i-th feature, or kNoRank if there is no rank.
+  // Returns rank of the i-th feature.
   virtual uint8_t Get(uint64_t i) const = 0;
 
   // Returns total number of ranks (or features, as there is a 1-1 correspondence).
@@ -113,6 +112,7 @@ public:
   //
   // Return true if rank table was successfully generated and written
   // or already exists and has correct format.
+  static bool CreateIfNotExists(platform::LocalCountryFile const & localFile) noexcept;
   static bool CreateIfNotExists(std::string const & mapPath) noexcept;
 };
 }  // namespace search
diff --git a/indexer/search_string_utils.cpp b/indexer/search_string_utils.cpp
index 6f32e2a950..7ded9149e9 100644
--- a/indexer/search_string_utils.cpp
+++ b/indexer/search_string_utils.cpp
@@ -30,9 +30,6 @@ std::vector<UniString> const kAllowedMisprints = {
     MakeUniString("ао"),
     MakeUniString("еиэ"),
     MakeUniString("шщ"),
-    // Spanish
-    MakeUniString("jh"),  // "Jose" <-> "Hose"
-    MakeUniString("fh"),  // "Hernández" <-> "Fernández"
 };
 
 std::pair<UniString, UniString> const kPreprocessReplacements[] = {
diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h
index 6e5d34c8d8..f867bc2b41 100644
--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h
@@ -28,7 +28,6 @@ NS_SWIFT_NAME(BookmarkGroup)
 @property(nonatomic, readonly, getter=isVisible) BOOL visible;
 @property(nonatomic, readonly, getter=isEmpty) BOOL empty;
 @property(nonatomic, readonly) BOOL hasDescription;
-@property(nonatomic, readonly) BOOL isHtmlDescription;
 @property(nonatomic, readonly) MWMBookmarkGroupAccessStatus accessStatus;
 @property(nonatomic, readonly) NSArray<MWMBookmark *> *bookmarks;
 @property(nonatomic, readonly) NSArray<MWMTrack *> *tracks;
diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m
index 7cfd57950b..3c991fa6a7 100644
--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m
@@ -84,8 +84,4 @@
   return [self.manager getCategoryGroupType:self.categoryId];
 }
 
-- (BOOL)isHtmlDescription {
-  return [self.manager isHtmlDescription:self.categoryId];
-}
-
 @end
diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
index 5898dc6d39..5afef3cc85 100644
--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
@@ -47,7 +47,6 @@ NS_SWIFT_NAME(BookmarksManager)
 - (MWMBookmarkGroupType)getCategoryGroupType:(MWMMarkGroupID)groupId;
 - (nullable NSURL *)getCategoryImageUrl:(MWMMarkGroupID)groupId;
 - (BOOL)hasExtraInfo:(MWMMarkGroupID)groupId;
-- (BOOL)isHtmlDescription:(MWMMarkGroupID)groupId;
 
 - (MWMMarkGroupID)createCategoryWithName:(NSString *)name;
 - (void)setCategory:(MWMMarkGroupID)groupId name:(NSString *)name;
diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
index e10dd71c17..f784405dc8 100644
--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
@@ -287,11 +287,6 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting
   return !data.m_description.empty() || !data.m_annotation.empty();
 }
 
-- (BOOL)isHtmlDescription:(MWMMarkGroupID)groupId {
-    auto const description = GetPreferredBookmarkStr(self.bm.GetCategoryData(groupId).m_description);
-    return strings::IsHTML(description);
-}
-
 - (MWMMarkGroupID)createCategoryWithName:(NSString *)name
 {
   auto groupId = self.bm.CreateBookmarkCategory(name.UTF8String);
diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift
index 762d8fc636..75771818db 100644
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift
@@ -4,7 +4,7 @@ protocol BookmarksListInfoViewControllerDelegate: AnyObject {
 }
 
 final class BookmarksListInfoViewController: UIViewController {
-  var info: IBookmarksListInfoViewModel? {
+  var info: IBookmakrsListInfoViewModel? {
     didSet {
       guard isViewLoaded, let info = info else { return }
       updateInfo(info)
@@ -26,23 +26,17 @@ final class BookmarksListInfoViewController: UIViewController {
   
   override func viewDidLoad() {
     super.viewDidLoad()
+    descriptionButton.setTitle(L("placepage_place_description").uppercased(), for: .normal)
     separatorsConstraints.forEach { $0.constant = 1 / UIScreen.main.scale }
-    descriptionButton.titleLabel?.numberOfLines = 2
 
     guard let info = info else { return }
     updateInfo(info)
   }
 
-  private func updateInfo(_ info: IBookmarksListInfoViewModel) {
+  private func updateInfo(_ info: IBookmakrsListInfoViewModel) {
     titleLabel.text = info.title
     descriptionButton.isHidden = !info.hasDescription
-    if info.hasDescription {
-      let description = info.isHtmlDescription
-        ? BookmarksListInfoViewController.getPlainText(info.description)
-        : info.description
-      descriptionButton.setTitle(description, for: .normal)
-    }
-    
+
     titleImageView.isHidden = true
     if let imageUrl = info.imageUrl {
       titleImageView.wi_setImage(with: imageUrl, transitionDuration: 0) { [weak self] (image, error) in
@@ -52,9 +46,4 @@ final class BookmarksListInfoViewController: UIViewController {
       }
     }
   }
-  
-  private static func getPlainText(_ htmlText: String) -> String? {
-    let formattedText = NSAttributedString.string(withHtml: htmlText, defaultAttributes: [:])
-    return formattedText?.string
-  }
 }
diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib
index aa13283583..f79f370e30 100644
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib
@@ -60,7 +60,7 @@
                                                 <constraint firstAttribute="bottom" secondItem="TFR-Qj-pUF" secondAttribute="bottom" id="j5w-Th-flQ"/>
                                             </constraints>
                                         </view>
-                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cxc-pt-qei">
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cxc-pt-qei">
                                             <rect key="frame" x="0.0" y="48" width="343" height="40"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="40" id="g6j-hs-K1V"/>
diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift
index 58fbed0172..40afe1a9fa 100644
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift
@@ -53,7 +53,7 @@ protocol IBookmarksListMenuItem {
 
 protocol IBookmarksListView: AnyObject {
   func setTitle(_ title: String)
-  func setInfo(_ info: IBookmarksListInfoViewModel)
+  func setInfo(_ info: IBookmakrsListInfoViewModel)
   func setSections(_ sections: [IBookmarksListSectionViewModel])
   func setMoreItemTitle(_ itemTitle: String)
   func showMenu(_ items: [IBookmarksListMenuItem])
@@ -125,10 +125,8 @@ protocol IBookmarksListRouter {
   func editTrack(trackId: MWMTrackID, completion: @escaping (Bool) -> Void)
 }
 
-protocol IBookmarksListInfoViewModel {
+protocol IBookmakrsListInfoViewModel {
   var title: String { get }
-  var description: String { get }
   var hasDescription: Bool { get }
-  var isHtmlDescription: Bool { get }
   var imageUrl: URL? { get }
 }
diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift
index 29ba05273c..14b5f8f30b 100644
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift
@@ -181,9 +181,8 @@ extension BookmarksListPresenter: IBookmarksListPresenter {
     view.enableEditing(true)
 
     let info = BookmarksListInfo(title: bookmarkGroup.title,
-                                 description: bookmarkGroup.detailedAnnotation,
+                                 author: bookmarkGroup.author,
                                  hasDescription: bookmarkGroup.hasDescription,
-                                 isHtmlDescription: bookmarkGroup.isHtmlDescription,
                                  imageUrl: bookmarkGroup.imageUrl,
                                  hasLogo: false)
     view.setInfo(info)
@@ -334,9 +333,8 @@ extension BookmarksListPresenter: IBookmarksListPresenter {
 extension BookmarksListPresenter: CategorySettingsViewControllerDelegate {
   func categorySettingsController(_ viewController: CategorySettingsViewController, didEndEditing categoryId: MWMMarkGroupID) {
     let info = BookmarksListInfo(title: bookmarkGroup.title,
-                                 description: bookmarkGroup.detailedAnnotation,
+                                 author: bookmarkGroup.author,
                                  hasDescription: bookmarkGroup.hasDescription,
-                                 isHtmlDescription: bookmarkGroup.isHtmlDescription,
                                  imageUrl: bookmarkGroup.imageUrl,
                                  hasLogo: false)
     view.setInfo(info)
@@ -497,19 +495,17 @@ fileprivate struct BookmarksListMenuItem: IBookmarksListMenuItem {
   }
 }
 
-fileprivate struct BookmarksListInfo: IBookmarksListInfoViewModel {
+fileprivate struct BookmarksListInfo: IBookmakrsListInfoViewModel {
   let title: String
-  let description: String
+  let author: String
   let hasDescription: Bool
-  let isHtmlDescription: Bool
   let imageUrl: URL?
   let hasLogo: Bool
 
-  init(title: String, description: String, hasDescription: Bool, isHtmlDescription: Bool, imageUrl: URL? = nil, hasLogo: Bool = false) {
+  init(title: String, author: String, hasDescription:Bool, imageUrl: URL? = nil, hasLogo: Bool = false) {
     self.title = title
-    self.description = description
+    self.author = author
     self.hasDescription = hasDescription
-    self.isHtmlDescription = isHtmlDescription
     self.imageUrl = imageUrl
     self.hasLogo = hasLogo
   }
diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift
index 372414b07a..89d6ec5f6d 100644
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift
@@ -20,38 +20,8 @@ extension BookmarksListRouter: IBookmarksListRouter {
   }
 
   func showDescription(_ bookmarkGroup: BookmarkGroup) {
-    let description = prepareHtmlDescription(bookmarkGroup)
-    let descriptionViewController = WebViewController(html: description, baseUrl: nil, title: bookmarkGroup.title)!
-    descriptionViewController.openInSafari = true
-    mapViewController.navigationController?.pushViewController(descriptionViewController, animated: true)
-  }
-  
-  func prepareHtmlDescription(_ bookmarkGroup: BookmarkGroup) -> String {
-    var description = bookmarkGroup.detailedAnnotation
-    if bookmarkGroup.isHtmlDescription {
-      if !description.contains("<body>") {
-        description = "<body>" + description
-      }
-    } else {
-      description = description.replacingOccurrences(of: "\n", with: "<br>")
-      let header = """
-                   <head>
-                     <style>
-                       body {
-                         line-height: 1.4;
-                         margin-right: 16px;
-                         margin-left: 16px;
-                       }
-                     </style>
-                   </head>
-                   <body>
-                   """
-      description = header + description
-    }
-    if !description.contains("</body>") {
-      description += "</body>"
-    }
-    return description
+//    let descriptionViewController = GuideDescriptionViewController(category: bookmarkGroup)
+//    mapViewController.navigationController?.pushViewController(descriptionViewController, animated: true)
   }
 
   func showSubgroup(_ subgroupId: MWMMarkGroupID) {
diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift
index dbe95c1a6f..c27518bae1 100644
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift
@@ -188,7 +188,7 @@ extension BookmarksListViewController: IBookmarksListView {
     self.title = title
   }
 
-  func setInfo(_ info: IBookmarksListInfoViewModel) {
+  func setInfo(_ info: IBookmakrsListInfoViewModel) {
     infoViewController.info = info
     updateInfoSize()
   }
diff --git a/kml/kml_tests/gpx_tests.cpp b/kml/kml_tests/gpx_tests.cpp
index 8b0b53822a..9e97e8360f 100644
--- a/kml/kml_tests/gpx_tests.cpp
+++ b/kml/kml_tests/gpx_tests.cpp
@@ -132,8 +132,13 @@ UNIT_TEST(Route)
 UNIT_TEST(Color)
 {
   kml::FileData const dataFromFile = loadGpxFromFile("gpx_test_data/color.gpx");
-  TEST_EQUAL(4278190335, dataFromFile.m_tracksData[0].m_layers[0].m_color.m_rgba, ());
-  TEST_EQUAL(65535, dataFromFile.m_tracksData[1].m_layers[0].m_color.m_rgba, ());
+  uint32_t const red = 0xFF0000FF;
+  uint32_t const blue = 0x0000FFFF;
+  uint32_t const black = 0x000000FF;
+  TEST_EQUAL(red, dataFromFile.m_tracksData[0].m_layers[0].m_color.m_rgba, ());
+  TEST_EQUAL(blue, dataFromFile.m_tracksData[1].m_layers[0].m_color.m_rgba, ());
+  TEST_EQUAL(black, dataFromFile.m_tracksData[2].m_layers[0].m_color.m_rgba, ());
+  TEST_EQUAL(red, dataFromFile.m_tracksData[3].m_layers[0].m_color.m_rgba, ());
 }
 
 UNIT_TEST(MultiTrackNames)
diff --git a/kml/serdes_gpx.cpp b/kml/serdes_gpx.cpp
index cc91312f8e..f3bd8d2a76 100644
--- a/kml/serdes_gpx.cpp
+++ b/kml/serdes_gpx.cpp
@@ -27,6 +27,7 @@ std::string_view constexpr kWpt = "wpt";
 std::string_view constexpr kRtePt = "rtept";
 std::string_view constexpr kName = "name";
 std::string_view constexpr kColor = "color";
+std::string_view constexpr kGarminColor = "gpxx:DisplayColor";
 std::string_view constexpr kDesc = "desc";
 std::string_view constexpr kMetadata = "metadata";
 
@@ -91,7 +92,7 @@ bool GpxParser::MakeValid()
 
 bool GpxParser::Push(std::string_view tag)
 {
-  m_tags.push_back(std::string{tag});
+  m_tags.push_back(tag);
   if (GetTagFromEnd(0) == gpx::kWpt)
     m_geometryType = GEOMETRY_TYPE_POINT;
   else if (GetTagFromEnd(0) == gpx::kTrkPt || GetTagFromEnd(0) == gpx::kRtePt)
@@ -139,6 +140,41 @@ void GpxParser::ParseColor(std::string const & value)
   m_color = kml::ToRGBA(colorBytes[0], colorBytes[1], colorBytes[2], (char)255);
 }
 
+
+// Garmin extensions spec: https://www8.garmin.com/xmlschemas/GpxExtensionsv3.xsd
+// Color mapping: https://help.locusmap.eu/topic/extend-garmin-gpx-compatibilty
+void GpxParser::ParseGarminColor(std::string const & v)
+{
+  static std::unordered_map<std::string, std::string> const kGarminToHex = {
+      {"Black", "000000"},
+      {"DarkRed", "8b0000"},
+      {"DarkGreen", "006400"},
+      {"DarkYellow", "b5b820"},
+      {"DarkBlue", "00008b"},
+      {"DarkMagenta", "8b008b"},
+      {"DarkCyan", "008b8b"},
+      {"LightGray", "cccccc"},
+      {"DarkGray", "444444"},
+      {"Red", "ff0000"},
+      {"Green", "00ff00"},
+      {"Yellow", "ffff00"},
+      {"Blue", "0000ff"},
+      {"Magenta", "ff00ff"},
+      {"Cyan", "00ffff"},
+      {"White", "ffffff"},
+      {"Transparent", "ff0000"}
+  };
+  auto const it = kGarminToHex.find(v);
+  if (it != kGarminToHex.end()) {
+    return ParseColor(it->second);
+  }
+  else
+  {
+    LOG(LWARNING, ("Unsupported color value", v));
+    return ParseColor("ff0000");  // default to red
+  }
+}
+
 void GpxParser::Pop(std::string_view tag)
 {
   ASSERT_EQUAL(m_tags.back(), tag, ());
@@ -238,6 +274,8 @@ void GpxParser::CharData(std::string value)
     }
     if (currTag == gpx::kColor)
       ParseColor(value);
+    else if (currTag == gpx::kGarminColor)
+      ParseGarminColor(value);
   }
 }
 }  // namespace gpx
diff --git a/kml/serdes_gpx.hpp b/kml/serdes_gpx.hpp
index 0c118920aa..d66be62466 100644
--- a/kml/serdes_gpx.hpp
+++ b/kml/serdes_gpx.hpp
@@ -41,12 +41,13 @@ private:
   void ResetPoint();
   bool MakeValid();
   void ParseColor(std::string const & value);
+  void ParseGarminColor(std::string const & value);
 
   FileData & m_data;
   CategoryData m_compilationData;
   CategoryData * m_categoryData;  // never null
 
-  std::vector<std::string> m_tags;
+  std::vector<std::string_view> m_tags;
   GeometryType m_geometryType;
   MultiGeometry m_geometry;
   uint32_t m_color;
diff --git a/map/bookmark_helpers.cpp b/map/bookmark_helpers.cpp
index d1b54efc59..15c9512a71 100644
--- a/map/bookmark_helpers.cpp
+++ b/map/bookmark_helpers.cpp
@@ -245,25 +245,17 @@ std::string RemoveInvalidSymbols(std::string const & name)
   return strings::ToUtf8(filtered);
 }
 
-
-std::string GenerateUniqueFileName(std::string const & path, std::string name, std::string_view ext)
+std::string GenerateUniqueFileName(const std::string & path, std::string name, std::string const & ext)
 {
   // Remove extension, if file name already contains it.
   if (strings::EndsWith(name, ext))
     name.resize(name.size() - ext.size());
 
   size_t counter = 1;
-  std::string suffix, res;
-  do
-  {
-    res = name;
-    res = base::JoinPath(path, res.append(suffix).append(ext));
-    if (!Platform::IsFileExistsByFullPath(res))
-      break;
+  std::string suffix;
+  while (Platform::IsFileExistsByFullPath(base::JoinPath(path, name + suffix + ext)))
     suffix = strings::to_string(counter++);
-  } while (true);
-
-  return res;
+  return base::JoinPath(path, name + suffix + ext);
 }
 
 std::string GenerateValidAndUniqueFilePathForKML(std::string const & fileName)
@@ -272,9 +264,13 @@ std::string GenerateValidAndUniqueFilePathForKML(std::string const & fileName)
   if (filePath.empty())
     filePath = kDefaultBookmarksFileName;
 
-  return GenerateUniqueFileName(GetBookmarksDirectory(), std::move(filePath), kKmlExtension);
+  return GenerateUniqueFileName(GetBookmarksDirectory(), std::move(filePath));
 }
 
+std::string const kKmzExtension = ".kmz";
+std::string const kKmlExtension = ".kml";
+std::string const kKmbExtension = ".kmb";
+std::string const kGpxExtension = ".gpx";
 std::string const kDefaultBookmarksFileName = "Bookmarks";
 
 // Populate empty category & track names based on file name: assign file name to category name,
diff --git a/map/bookmark_helpers.hpp b/map/bookmark_helpers.hpp
index e2cabe2a5e..e539988b95 100644
--- a/map/bookmark_helpers.hpp
+++ b/map/bookmark_helpers.hpp
@@ -65,10 +65,10 @@ enum class BookmarkBaseType : uint16_t
   Count
 };
 
-std::string_view constexpr kKmzExtension = ".kmz";
-std::string_view constexpr kKmlExtension = ".kml";
-std::string_view constexpr kKmbExtension = ".kmb";
-std::string_view constexpr kGpxExtension = ".gpx";
+extern std::string const kKmzExtension;
+extern std::string const kKmlExtension;
+extern std::string const kKmbExtension;
+extern std::string const kGpxExtension;
 extern std::string const kDefaultBookmarksFileName;
 
 enum class KmlFileType
@@ -93,7 +93,7 @@ inline std::string DebugPrint(KmlFileType fileType)
 /// @{
 std::string GetBookmarksDirectory();
 std::string RemoveInvalidSymbols(std::string const & name);
-std::string GenerateUniqueFileName(const std::string & path, std::string name, std::string_view ext = kKmlExtension);
+std::string GenerateUniqueFileName(const std::string & path, std::string name, std::string const & ext = kKmlExtension);
 std::string GenerateValidAndUniqueFilePathForKML(std::string const & fileName);
 /// @}
 
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 945fcf497f..34ecb9cb0c 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -81,7 +81,7 @@ BookmarkManager::SharingResult GetFileForSharing(BookmarkManager::KMLDataCollect
   if (fileName.empty())
     fileName = base::GetNameFromFullPathWithoutExt(kmlToShare.first);
 
-  auto const filePath = base::JoinPath(GetPlatform().TmpDir(), fileName.append(kKmlExtension));
+  auto const filePath = base::JoinPath(GetPlatform().TmpDir(), fileName + kKmlExtension);
   SCOPE_GUARD(fileGuard, std::bind(&base::DeleteFileX, filePath));
 
   auto const categoryId = kmlToShare.second->m_categoryData.m_id;
@@ -92,7 +92,7 @@ BookmarkManager::SharingResult GetFileForSharing(BookmarkManager::KMLDataCollect
                                           "Bookmarks file does not exist.");
   }
 
-  auto const tmpFilePath = base::JoinPath(GetPlatform().TmpDir(), fileName.append(kKmzExtension));
+  auto const tmpFilePath = base::JoinPath(GetPlatform().TmpDir(), fileName + kKmzExtension);
   if (!CreateZipFromPathDeflatedAndDefaultCompression(filePath, tmpFilePath))
   {
     return BookmarkManager::SharingResult(categoryId, BookmarkManager::SharingResult::Code::ArchiveError,
@@ -1798,7 +1798,7 @@ void BookmarkManager::ClearCategories()
 }
 
 BookmarkManager::KMLDataCollectionPtr BookmarkManager::LoadBookmarks(
-    std::string const & dir, std::string_view ext, KmlFileType fileType,
+    std::string const & dir, std::string const & ext, KmlFileType fileType,
     BookmarksChecker const & checker)
 {
   Platform::FilesList files;
@@ -2588,7 +2588,7 @@ BookmarkManager::KMLDataCollectionPtr BookmarkManager::PrepareToSaveBookmarks(
       if (name.empty())
         name = kDefaultBookmarksFileName;
 
-      file = GenerateUniqueFileName(fileDir, std::move(name), kKmlExtension);
+      file = GenerateUniqueFileName(fileDir, std::move(name));
       group->SetFileName(file);
     }
 
diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp
index e8882fc7f7..0e2d4f497e 100644
--- a/map/bookmark_manager.hpp
+++ b/map/bookmark_manager.hpp
@@ -603,7 +603,7 @@ private:
   void LoadBookmarkRoutine(std::string const & filePath, bool isTemporaryFile);
 
   using BookmarksChecker = std::function<bool(kml::FileData const &)>;
-  KMLDataCollectionPtr LoadBookmarks(std::string const & dir, std::string_view ext,
+  KMLDataCollectionPtr LoadBookmarks(std::string const & dir, std::string const & ext,
                                      KmlFileType fileType, BookmarksChecker const & checker);
 
   void GetDirtyGroups(kml::GroupIdSet & dirtyGroups) const;
diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp
index c37f9e66f0..1c687b7a8c 100644
--- a/map/map_tests/bookmarks_test.cpp
+++ b/map/map_tests/bookmarks_test.cpp
@@ -494,7 +494,7 @@ UNIT_TEST(Bookmarks_UniqueFileName)
 {
   string const BASE = "SomeUniqueFileName";
   string const FILEBASE = "./" + BASE;
-  string const FILENAME = FILEBASE + string{kKmlExtension};
+  string const FILENAME = FILEBASE + kKmlExtension;
 
   {
     FileWriter file(FILENAME);
diff --git a/platform/platform.cpp b/platform/platform.cpp
index 54f65002da..e14ca2c295 100644
--- a/platform/platform.cpp
+++ b/platform/platform.cpp
@@ -214,13 +214,13 @@ void Platform::GetFontNames(FilesList & res) const
   LOG(LINFO, ("Available font files:", (res)));
 }
 
-void Platform::GetFilesByExt(std::string const & directory, std::string_view ext, FilesList & outFiles)
+void Platform::GetFilesByExt(std::string const & directory, std::string const & ext, FilesList & outFiles)
 {
   // Transform extension mask to regexp (.mwm -> \.mwm$)
   ASSERT ( !ext.empty(), () );
   ASSERT_EQUAL ( ext[0], '.' , () );
-  std::string regexp = "\\";
-  GetFilesByRegExp(directory, regexp.append(ext).append("$"), outFiles);
+
+  GetFilesByRegExp(directory, '\\' + ext + '$', outFiles);
 }
 
 // static
diff --git a/platform/platform.hpp b/platform/platform.hpp
index e18ff07000..d185c60228 100644
--- a/platform/platform.hpp
+++ b/platform/platform.hpp
@@ -210,7 +210,7 @@ public:
   /// @param directory directory path with slash at the end
   //@{
   /// @param ext files extension to find, like ".mwm".
-  static void GetFilesByExt(std::string const & directory, std::string_view ext,
+  static void GetFilesByExt(std::string const & directory, std::string const & ext,
                             FilesList & outFiles);
   static void GetFilesByRegExp(std::string const & directory, std::string const & regexp,
                                FilesList & outFiles);
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index d00071117a..e651a857ea 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -447,8 +447,6 @@ Framework & MainWindow::GetFramework() const
 
 void MainWindow::CreateCountryStatusControls()
 {
-  setStyleSheet("QPushButton { color: black; } QLabel { color: black; }");
-
   QHBoxLayout * mainLayout = new QHBoxLayout();
   m_downloadButton = new QPushButton("Download");
   mainLayout->addWidget(m_downloadButton, 0, Qt::AlignHCenter);
diff --git a/routing/routing_integration_tests/turn_test.cpp b/routing/routing_integration_tests/turn_test.cpp
index a8dc973243..e154b210ae 100644
--- a/routing/routing_integration_tests/turn_test.cpp
+++ b/routing/routing_integration_tests/turn_test.cpp
@@ -1296,20 +1296,6 @@ UNIT_TEST(Cyprus_A1_A5_TurnTestNextRoad)
   TEST_EQUAL(ri.m_destination_ref, "A5", ());
 }
 
-UNIT_TEST(Zurich_UseMainTurn)
-{
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(47.364832, 8.5656975), {0., 0.},
-                                  mercator::FromLatLon(47.3640678, 8.56567312));
-
-  Route const & route = *routeResult.first;
-  RouterResultCode const result = routeResult.second;
-  TEST_EQUAL(result, RouterResultCode::NoError, ());
-  integration::TestTurnCount(route, 1);
-  integration::TestRouteLength(route, 135.573);
-}
-
 namespace
 {
 template <class ContT> void TestNoTurns(ContT const & cont)
diff --git a/routing_common/car_model_coefs.hpp b/routing_common/car_model_coefs.hpp
index 04b85014e6..6f4f3c1e1e 100644
--- a/routing_common/car_model_coefs.hpp
+++ b/routing_common/car_model_coefs.hpp
@@ -35,8 +35,8 @@ HighwayBasedFactors const kHighwayBasedFactors = {
     // By VNG: Changed 0.3 -> 0.95 for Road and 0.3 -> 1.0 for Track.
     // They are already have very small speeds (10, 5 respectively).
     // There are no (99%) traffic lights or pedestrian crossings on this kind of roads.
-    {HighwayType::HighwayService, InOutCityFactor(0.70)},
-    {HighwayType::HighwayRoad, InOutCityFactor(0.90)},
+    {HighwayType::HighwayService, InOutCityFactor(0.80)},
+    {HighwayType::HighwayRoad, InOutCityFactor(0.95)},
     {HighwayType::HighwayTrack, InOutCityFactor(1.0)},
     {HighwayType::ManMadePier, InOutCityFactor(0.90)},
 
diff --git a/search/dummy_rank_table.cpp b/search/dummy_rank_table.cpp
index ec357ac588..9d54b9f220 100644
--- a/search/dummy_rank_table.cpp
+++ b/search/dummy_rank_table.cpp
@@ -2,14 +2,16 @@
 
 #include "base/macros.hpp"
 
+#include <limits>
+
 namespace search
 {
-uint8_t DummyRankTable::Get(uint64_t /* i */) const { return kNoRank; }
+uint8_t DummyRankTable::Get(uint64_t /* i */) const { return 0; }
 
 uint64_t DummyRankTable::Size() const
 {
   NOTIMPLEMENTED();
-  return 0;
+  return std::numeric_limits<uint64_t>::max();
 }
 
 RankTable::Version DummyRankTable::GetVersion() const
diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index be3f17b5ac..cbd55fb746 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -1436,8 +1436,8 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken, CBV con
       }
     }
 
-    // Following code creates a fake TYPE_BUILDING layer and intersects it with the streets layer.
-    // Controversial: we can emit streets like buildings here. Filtered in IsFakeBuildingButStreet().
+    // Following code creates a fake layer with buildings and
+    // intersects it with the streets layer.
     layers.emplace_back();
     SCOPE_GUARD(cleanupGuard, [&]{ layers.pop_back(); });
 
@@ -1445,8 +1445,7 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken, CBV con
     InitLayer(Model::TYPE_BUILDING, m_postcodes.m_tokenRange, layer);
 
     vector<uint32_t> features;
-    m_postcodes.m_countryFeatures.ForEach([&features](uint64_t bit)
-    {
+    m_postcodes.m_countryFeatures.ForEach([&features](uint64_t bit) {
       features.push_back(base::asserted_cast<uint32_t>(bit));
     });
     layer.m_sortedFeatures = &features;
@@ -1684,12 +1683,8 @@ void Geocoder::FindPaths(BaseContext & ctx)
     return true;
   };
 
-  m_finder.ForEachReachableVertex(*m_matcher, sortedLayers, [&](IntersectionResult const & result)
-  {
+  m_finder.ForEachReachableVertex(*m_matcher, sortedLayers, [&](IntersectionResult const & result) {
     ASSERT(result.IsValid(), ());
-    if (result.IsFakeBuildingButStreet())
-      return;
-
     EmitResult(ctx, m_context->GetId(), result.InnermostResult(), innermostLayer.m_type,
                innermostLayer.m_tokenRange, &result, ctx.AllTokensUsed(),
                isExactMatch(ctx, result));
diff --git a/search/intersection_result.hpp b/search/intersection_result.hpp
index 509c15e035..926ca297a1 100644
--- a/search/intersection_result.hpp
+++ b/search/intersection_result.hpp
@@ -16,19 +16,13 @@ struct IntersectionResult
 
   void Set(Model::Type type, uint32_t id);
 
-  // Returns the first valid feature among the [SUBPOI, COMPLEX_POI, BUILDING, STREET].
+  // Returns the first valid feature among the [SUBPOI, COMPLEX_POI, BUILDING,
+  // STREET].
   uint32_t InnermostResult() const;
 
   // Returns true when at least one valid feature exists.
   inline bool IsValid() const { return InnermostResult() != kInvalidId; }
 
-  // Building == Streets means that we have actual street result, but got here
-  // via _fake_ TYPE_BUILDING layer (see MatchPOIsAndBuildings).
-  inline bool IsFakeBuildingButStreet() const
-  {
-    return m_building != kInvalidId && m_building == m_street;
-  }
-
   // Clears all fields to an invalid state.
   void Clear();
 
diff --git a/search/model.cpp b/search/model.cpp
index c2d60b0cf2..8ed1f6ca4a 100644
--- a/search/model.cpp
+++ b/search/model.cpp
@@ -111,13 +111,7 @@ public:
 
   bool operator()(FeatureType & ft) const
   {
-    if (!ft.GetHouseNumber().empty())
-      return true;
-
-    if (ft.GetGeomType() == feature::GeomType::Line)
-      return IsAddressInterpolChecker::Instance()(ft);
-    else
-      return IsBuildingChecker::Instance()(ft);
+    return !ft.GetHouseNumber().empty() || IsBuildingChecker::Instance()(ft);
   }
 };
 }  // namespace
diff --git a/search/ranker.cpp b/search/ranker.cpp
index 628d0505a8..f823b9f9d1 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -143,17 +143,8 @@ NameScores GetNameScores(FeatureType & ft, Geocoder::Params const & params,
   }
 
   if (type == Model::TYPE_BUILDING)
-  {
-    if (ft.GetGeomType() == feature::GeomType::Line)
-    {
-      // Separate case for addr:interpolation (Building + Line).
-      ASSERT(!ft.GetRef().empty(), ());
-      // Just assign SUBSTRING with no errors (was checked in HouseNumbersMatch).
-      bestScores.UpdateIfBetter(NameScores(NameScore::SUBSTRING, ErrorsMade(0), false, 4));
-    }
-    else
-      UpdateNameScores(ft.GetHouseNumber(), StringUtf8Multilang::kDefaultCode, sliceNoCategories, bestScores);
-  }
+    UpdateNameScores(ft.GetHouseNumber(), StringUtf8Multilang::kDefaultCode, sliceNoCategories,
+                     bestScores);
 
   if (ftypes::IsAirportChecker::Instance()(ft))
   {
@@ -383,8 +374,8 @@ public:
       }, Delimiters());
 
       // Factor is a number of the rest, not common matched tokens in Feature' name. Bigger is worse.
-      // Example when count == 0: UTH airport has empty name, but "ut" is a _common_ token.
-      info.m_commonTokensFactor = min(3, std::max(0, count - int(info.m_tokenRanges[info.m_type].Size())));
+      info.m_commonTokensFactor = min(3, count - int(info.m_tokenRanges[info.m_type].Size()));
+      ASSERT_GREATER_OR_EQUAL(info.m_commonTokensFactor, 0, ());
     }
 
     res.SetRankingInfo(info);
diff --git a/search/ranking_info.cpp b/search/ranking_info.cpp
index 34e1ec175d..35fd65edfc 100644
--- a/search/ranking_info.cpp
+++ b/search/ranking_info.cpp
@@ -84,7 +84,6 @@ double constexpr kStreetType[] = {
   0,          // Pedestrian
   0,          // Cycleway
   0,          // Outdoor
-  0.004,      // Minors
   0.004,      // Residential
   0.005,      // Regular
   0.006,      // Motorway
@@ -405,7 +404,6 @@ std::string DebugPrint(StreetType type)
   case StreetType::Pedestrian: return "Pedestrian";
   case StreetType::Cycleway: return "Cycleway";
   case StreetType::Outdoor: return "Outdoor";
-  case StreetType::Minors: return "Minors";
   case StreetType::Residential: return "Residential";
   case StreetType::Regular: return "Regular";
   case StreetType::Motorway: return "Motorway";
diff --git a/search/ranking_utils.cpp b/search/ranking_utils.cpp
index 203406319e..31da4e0b5f 100644
--- a/search/ranking_utils.cpp
+++ b/search/ranking_utils.cpp
@@ -112,7 +112,7 @@ bool IsStopWord(UniString const & s)
       // Don't want to put _full_ stopwords list, not to break current ranking.
       // Only 2-letters and the most common.
       char const * arr[] = {
-        "a", "s", "the",  // English
+        "a", "s",         // English
         "am", "im", "an", // German
         "d", "de", "di", "da", "la", "le", // French, Spanish, Italian
         "и", "я"          // Cyrillic
diff --git a/search/search_integration_tests/processor_test.cpp b/search/search_integration_tests/processor_test.cpp
index 885622a04b..8bf5998de9 100644
--- a/search/search_integration_tests/processor_test.cpp
+++ b/search/search_integration_tests/processor_test.cpp
@@ -559,7 +559,7 @@ UNIT_CLASS_TEST(ProcessorTest, TestRankingInfo_PureCategory)
   }
 }
 
-UNIT_CLASS_TEST(ProcessorTest, RankingInfo_ErrorsMade_1)
+UNIT_CLASS_TEST(ProcessorTest, TestRankingInfo_ErrorsMade)
 {
   TestCity chekhov({0, 0}, "Чеховъ Антонъ Павловичъ", "ru", 100 /* rank */);
 
@@ -605,7 +605,6 @@ UNIT_CLASS_TEST(ProcessorTest, RankingInfo_ErrorsMade_1)
 
   checkErrors("Cafe Yesenina", ErrorsMade(0));
   checkErrors("Cafe Jesenina", ErrorsMade(1));
-  /// @see search_string_utils.cpp, kAllowedMisprints
   // We allow only Y->{E, J, I, U} misprints for the first letter.
   checkErrors("Cafe Esenina", ErrorsMade(2));
 
@@ -635,33 +634,6 @@ UNIT_CLASS_TEST(ProcessorTest, RankingInfo_ErrorsMade_1)
   checkErrors("лермонтов чеховъ антон павлович", ErrorsMade(2));
 }
 
-// https://github.com/organicmaps/organicmaps/issues/5296
-UNIT_CLASS_TEST(ProcessorTest, RankingInfo_ErrorsMade_2)
-{
-  TestStreet hernandes({{-0.5, -0.5}, {0, 0}, {0.5, 0.5}}, "José Hernández", "es");
-
-  auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
-  {
-    builder.Add(hernandes);
-  });
-
-  SetViewport(m2::RectD(-1, -1, 1, 1));
-
-  auto checkErrors = [&](string const & query, ErrorsMade const & errorsMade)
-  {
-    auto request = MakeRequest(query, "es");
-    auto const & results = request->Results();
-
-    Rules rules{ExactMatch(wonderlandId, hernandes)};
-    TEST(ResultsMatch(results, rules), (query));
-    TEST_EQUAL(results.size(), 1, (query));
-    TEST_EQUAL(results[0].GetRankingInfo().m_errorsMade, errorsMade, (query));
-  };
-
-  checkErrors("Hose", ErrorsMade(1));
-  checkErrors("Fernández", ErrorsMade(1));
-}
-
 UNIT_CLASS_TEST(ProcessorTest, TestHouseNumbers)
 {
   TestCity greenCity({0, 0}, "Зеленоград", "ru", 100 /* rank */);
diff --git a/search/search_quality/search_quality_tests/real_mwm_tests.cpp b/search/search_quality/search_quality_tests/real_mwm_tests.cpp
index bac545317a..b4985d1cdd 100644
--- a/search/search_quality/search_quality_tests/real_mwm_tests.cpp
+++ b/search/search_quality/search_quality_tests/real_mwm_tests.cpp
@@ -474,9 +474,9 @@ UNIT_CLASS_TEST(MwmTestsFixture, Street_BusStop)
     auto const & results = request->Results();
     TEST_GREATER(results.size(), kTopPoiResultsCount, ());
 
-    // Top results are Hotel and Street (sometimes bus stop).
-    Range const range(results);
-    EqualClassifType(range, GetClassifTypes({{"tourism", "hotel"}, {"highway", "bus_stop"}, {"highway", "residential"}}));
+    // Top results are Hotel and Street.
+    Range const range(results, 0, 3);
+    EqualClassifType(range, GetClassifTypes({{"tourism", "hotel"}, {"shop", "supermarket"}, {"highway"}}));
   }
 
   {
@@ -500,17 +500,6 @@ UNIT_CLASS_TEST(MwmTestsFixture, Street_BusStop)
     EqualClassifType(range, GetClassifTypes({{"highway", "bus_stop"}}));
     TEST_LESS(SortedByDistance(range, center), 5000.0, ());
   }
-
-  {
-    auto request = MakeRequest("Juncal train", "en");
-    auto const & results = request->Results();
-    TEST_GREATER(results.size(), kTopPoiResultsCount, ());
-
-    // First result is a train station in other MWM, >200km away.
-    TEST(EqualClassifType(results[0].GetFeatureType(), classif().GetTypeByPath({"railway", "station"})), ());
-    double const dist = ms::DistanceOnEarth(center, mercator::ToLatLon(results[0].GetFeatureCenter()));
-    TEST_GREATER(dist, 2.0E5, ());
-  }
 }
 
 UNIT_CLASS_TEST(MwmTestsFixture, Generic_Buildings_Rank)
@@ -533,6 +522,7 @@ UNIT_CLASS_TEST(MwmTestsFixture, Generic_Buildings_Rank)
   {
     auto request = MakeRequest("dia ", "en");
     auto const & results = request->Results();
+    LOG(LINFO, (results));
     TEST_GREATER(results.size(), kTopPoiResultsCount, ());
 
     Range const range(results);
@@ -540,84 +530,4 @@ UNIT_CLASS_TEST(MwmTestsFixture, Generic_Buildings_Rank)
     TEST_LESS(SortedByDistance(range, center), 1000.0, ());
   }
 }
-
-UNIT_CLASS_TEST(MwmTestsFixture, UTH_Airport)
-{
-  auto const aeroportType = classif().GetTypeByPath({"aeroway", "aerodrome", "international"});
-
-  // Under UTH airport.
-  ms::LatLon const center(17.3867863, 102.7775625);
-  SetViewportAndLoadMaps(center);
-
-  // "ut" query is _common_
-  auto request = MakeRequest("ut", "en");
-  auto const & results = request->Results();
-
-  bool found = false;
-  // The first 5 will be cities suggestions.
-  for (size_t i = 0; i < 10; ++i)
-  {
-    auto const & r = results[i];
-    if (r.GetResultType() == search::Result::Type::Feature &&
-        EqualClassifType(r.GetFeatureType(), aeroportType))
-    {
-      found = true;
-      break;
-    }
-  }
-
-  TEST(found, (results));
-}
-
-// https://github.com/organicmaps/organicmaps/issues/5186
-UNIT_CLASS_TEST(MwmTestsFixture, Milan_Streets)
-{
-  // Milan
-  ms::LatLon const center(45.46411, 9.19045);
-  SetViewportAndLoadMaps(center);
-
-  auto request = MakeRequest("Via Domenichino", "it");
-  auto const & results = request->Results();
-
-  size_t constexpr kResultsCount = 2;
-  TEST_GREATER(results.size(), kResultsCount, ());
-
-  Range const range(results, 0, kResultsCount);
-  TEST_LESS(SortedByDistance(range, center), 20000.0, ());
-}
-
-// https://github.com/organicmaps/organicmaps/issues/5150
-UNIT_CLASS_TEST(MwmTestsFixture, London_RedLion)
-{
-  // Milan
-  ms::LatLon const center(51.49263, -0.12877);
-  SetViewportAndLoadMaps(center);
-
-  auto request = MakeRequest("Red Lion", "en");
-  auto const & results = request->Results();
-
-  TEST_GREATER(results.size(), kPopularPoiResultsCount, ());
-
-  // Top first results "The Red Lion" in 5 km.
-  Range const range(results);
-  TEST_LESS(SortedByDistance(range, center), 5000.0, ());
-}
-
-UNIT_CLASS_TEST(MwmTestsFixture, AddrInterpolation_Rank)
-{
-  // Buenos Aires (Palermo)
-  ms::LatLon const center(-34.57852, -58.42567);
-  SetViewportAndLoadMaps(center);
-
-  auto request = MakeRequest("Sante Fe 1176", "en");
-  auto const & results = request->Results();
-
-  TEST_GREATER(results.size(), kPopularPoiResultsCount, ());
-
-  // Top first address results in 50 km.
-  Range const range(results);
-  EqualClassifType(range, GetClassifTypes({{"addr:interpolation"}}));
-  TEST_LESS(SortedByDistance(range, center), 50000.0, ());
-}
-
 } // namespace real_mwm_tests