diff --git a/routing/index_graph_starter_joints.hpp b/routing/index_graph_starter_joints.hpp
index cdb3f8c779..215980c357 100644
--- a/routing/index_graph_starter_joints.hpp
+++ b/routing/index_graph_starter_joints.hpp
@@ -493,10 +493,7 @@ bool IndexGraphStarterJoints<Graph>::FillEdgesAndParentsWeights(
       // segments (differ only the ends), so we add to |parentWeights| the same
       // value: parentWeights[i].
       if (edges.size() != prevSize)
-      {
-        CHECK_LESS(i, parentWeights.size(), ());
         parentWeights.push_back(parentWeights[i]);
-      }
     }
   }
 
@@ -536,12 +533,25 @@ void IndexGraphStarterJoints<Graph>::GetEdgeList(
     for (size_t i = 0; i < edges.size(); ++i)
     {
       // Saving weight of current edges for returning in the next iterations.
-      m_savedWeight[edges[i].GetTarget()] = edges[i].GetWeight();
+      /// @todo By VNG. The logic with m_savedWeight 'cache' looks very strange for me.
+      /// Looks like we shoud store previously accumulated weight for each queued state in A*.
+
+      auto const & w = edges[i].GetWeight();
+      auto const & t = edges[i].GetTarget();
+      //if (w.GetWeight() > 7000)
+      //  LOG_SHORT(LDEBUG, ("Big weight =", w, "for target =", t, "and parent =", vertex));
+
+      auto res = m_savedWeight.insert(std::make_pair(t, w));
+      if (!res.second)
+      {
+        //LOG_SHORT(LDEBUG, ("Override weight =", w, " for target =", t, "and parent =", vertex));
+        res.first->second = std::max(res.first->second, w);
+      }
+
       // For parent JointSegment we know its weight without last segment, because for each child
       // it will differ (child_1 => parent != child_2 => parent), but (!) we save this weight in
       // |parentWeights[]|. So the weight of an ith edge is a cached "weight of parent JointSegment" +
       // "parentWeight[i]".
-      CHECK_LESS(i, parentWeights.size(), ());
       edges[i].GetWeight() = weight + parentWeights[i];
     }
 
diff --git a/routing/junction_visitor.cpp b/routing/junction_visitor.cpp
index 2875d539af..e4dd528ebe 100644
--- a/routing/junction_visitor.cpp
+++ b/routing/junction_visitor.cpp
@@ -22,10 +22,18 @@ void DebugRoutingState(JointSegment const & vertex, std::optional<JointSegment>
 //  std::cout << std::endl;
 
   // 3. Set breakpoint on a specific vertex.
-//  if (vertex.GetMwmId() == 706 && vertex.GetFeatureId() == 147648 &&
-//      vertex.GetEndSegmentId() == 75)
+//  if (vertex.GetMwmId() == 400 && vertex.GetFeatureId() == 2412 &&
+//      vertex.GetEndSegmentId() == 0)
 //  {
 //    int noop = 0;
+//  }
+
+  // 4. Set breakpoint when MWM was changed.
+//  if (parent)
+//  {
+//    auto const & p = *parent;
+//    if (!p.IsFake() && !vertex.IsFake() && p.GetMwmId() != vertex.GetMwmId())
+//      int noop = 0;
 //  }
 }
 #endif
diff --git a/routing/single_vehicle_world_graph.cpp b/routing/single_vehicle_world_graph.cpp
index 05913e5ccc..751a754ad0 100644
--- a/routing/single_vehicle_world_graph.cpp
+++ b/routing/single_vehicle_world_graph.cpp
@@ -49,7 +49,10 @@ void SingleVehicleWorldGraph::CheckAndProcessTransitFeatures(Segment const & par
     NumMwmId const edgeMwmId = target.GetMwmId();
 
     if (!m_crossMwmGraph->IsFeatureTransit(edgeMwmId, target.GetFeatureId()))
+    {
+      ASSERT_EQUAL(mwmId, edgeMwmId, ());
       continue;
+    }
 
     auto & currentIndexGraph = GetIndexGraph(mwmId);
 
@@ -123,6 +126,8 @@ void SingleVehicleWorldGraph::GetEdgeList(
   // Comment this call to debug routing on single generated mwm.
   if (m_mode != WorldGraphMode::JointSingleMwm)
     CheckAndProcessTransitFeatures(parent, jointEdges, parentWeights, isOutgoing);
+
+  ASSERT_EQUAL(jointEdges.size(), parentWeights.size(), ());
 }
 
 LatLonWithAltitude const & SingleVehicleWorldGraph::GetJunction(Segment const & segment,
diff --git a/routing_common/num_mwm_id.hpp b/routing_common/num_mwm_id.hpp
index 3c34927d45..50a2142e00 100644
--- a/routing_common/num_mwm_id.hpp
+++ b/routing_common/num_mwm_id.hpp
@@ -30,7 +30,7 @@ public:
     m_idToFile.push_back(file);
     m_fileToId[file] = id;
 
-    LOG(LDEBUG, ("MWM:", file.GetName(), "=", id));
+    //LOG(LDEBUG, ("MWM:", file.GetName(), "=", id));
   }
 
   bool ContainsFile(platform::CountryFile const & file) const