diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index fe01d6d9d5..06eeb1eb64 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -239,19 +239,20 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture
         params.m_depthLayer = renderInfo.m_depthLayer;
         params.m_minVisibleScale = renderInfo.m_minZoom;
 
-        uint32_t overlayIndex = 0;
+        uint32_t const overlayIndex = kStartUserMarkOverlayIndex + renderInfo.m_index;
         if (renderInfo.m_hasTitlePriority)
         {
           params.m_specialDisplacement = SpecialDisplacement::UserMark;
           params.m_specialPriority = renderInfo.m_priority;
-          overlayIndex = kStartUserMarkOverlayIndex + renderInfo.m_index;
-
           params.m_startOverlayRank = dp::OverlayRank0;
-          if (renderInfo.m_symbolNames != nullptr)
-            params.m_startOverlayRank++;
-          if (renderInfo.m_coloredSymbols != nullptr)
-            params.m_startOverlayRank++;
-          ASSERT_LESS(params.m_startOverlayRank, dp::OverlayRanksCount, ());
+          if (renderInfo.m_hasSymbolPriority)
+          {
+            if (renderInfo.m_symbolNames != nullptr)
+              params.m_startOverlayRank++;
+            if (renderInfo.m_coloredSymbols != nullptr)
+              params.m_startOverlayRank++;
+            ASSERT_LESS(params.m_startOverlayRank, dp::OverlayRanksCount, ());
+          }
         }
 
         if (renderInfo.m_symbolSizes != nullptr)
diff --git a/map/routing_mark.cpp b/map/routing_mark.cpp
index 5bcd660d9a..c157cffa62 100644
--- a/map/routing_mark.cpp
+++ b/map/routing_mark.cpp
@@ -91,7 +91,10 @@ void RouteMarkPoint::SetMarkData(RouteMarkData && data)
   m_markData = std::move(data);
   m_titleDecl.m_primaryText = m_markData.m_title;
   if (!m_titleDecl.m_primaryText.empty())
+  {
     m_titleDecl.m_secondaryText = m_markData.m_subTitle;
+    m_titleDecl.m_secondaryOptional = true;
+  }
   else
     m_titleDecl.m_secondaryText.clear();
 }