diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index 00262d58a1..bfb53afeb3 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -948,17 +948,21 @@ public class RoutingHelper {
 
 	public static class CurrentStreetName {
 		public String text;
+		public TurnType turnType;
+		public boolean showMarker; // turn type has priority over showMarker
+		public RouteDataObject shieldObject;
+		public String exitRef;
 	}
 
-	public synchronized CurrentStreetName getCurrentName(TurnType[] next, NextDirectionInfo n){
+	public synchronized CurrentStreetName getCurrentName(NextDirectionInfo n){
 		CurrentStreetName streetName = new CurrentStreetName();
 		Location l = lastFixedLocation;
 		float speed = 0;
 		if(l != null && l.hasSpeed()) {
 			speed = l.getSpeed();
 		}
-		if(next != null && n.directionInfo != null) {
-			next[0] = n.directionInfo.getTurnType();
+		if(n.directionInfo != null) {
+			streetName.turnType = n.directionInfo.getTurnType();
 		}
 		if(n.distanceTo > 0  && n.directionInfo != null && !n.directionInfo.getTurnType().isSkipToSpeak() &&
 				voiceRouter.isDistanceLess(speed, n.distanceTo, voiceRouter.PREPARE_DISTANCE * 0.75f)) {
@@ -966,25 +970,39 @@ public class RoutingHelper {
 			String rf = n.directionInfo.getRef();
 			String dn = n.directionInfo.getDestinationName();
 			streetName.text = formatStreetName(nm, null, dn, "»");
-			return streetName;
 		}
-		RouteSegmentResult rs = getCurrentSegmentResult();
-		if(rs != null) {
-			streetName.text = getRouteSegmentStreetName(rs);
-			if (!Algorithms.isEmpty(streetName.text )) {
-				return streetName;
+		if (Algorithms.isEmpty(streetName.text)) {
+			RouteSegmentResult rs = getCurrentSegmentResult();
+			if (rs != null) {
+				streetName.text = getRouteSegmentStreetName(rs);
 			}
 		}
-		rs = getNextStreetSegmentResult();
-		if(rs != null) {
-			streetName.text = getRouteSegmentStreetName(rs);
-			if (!Algorithms.isEmpty(streetName.text)) {
-				if(next != null) {
-					next[0] = TurnType.valueOf(TurnType.C, false);
+		if (Algorithms.isEmpty(streetName.text)) {
+			RouteSegmentResult rs = getNextStreetSegmentResult();
+			if (rs != null) {
+				streetName.text = getRouteSegmentStreetName(rs);
+				if (!Algorithms.isEmpty(streetName.text)) {
+					if (streetName.turnType != null) {
+						streetName.turnType = TurnType.valueOf(TurnType.C, false);
+					}
 				}
-				return streetName;
 			}
 		}
+		// show exit ref
+		if (n.directionInfo != null && n.directionInfo.getExitInfo() != null &&
+				n.imminent >= 0) {
+			streetName.exitRef = n.directionInfo.getExitInfo().getRef();
+			if (!Algorithms.isEmpty(n.directionInfo.getExitInfo().getExitStreetName())) {
+				streetName.text = n.directionInfo.getExitInfo().getExitStreetName();
+			}
+		}
+		// show shield
+		if (n.directionInfo != null) {
+			streetName.shieldObject = n.directionInfo.getRouteDataObject();
+		}
+		if (streetName.turnType == null) {
+			streetName.showMarker = true;
+		}
 		return streetName;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 5042e3388c..5eef90a95d 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -931,11 +931,11 @@ public class MapInfoWidgetsFactory {
 		private View waypointInfoBar;
 		private LocationPointWrapper lastPoint;
 		private TurnDrawable turnDrawable;
-		private boolean showMarker;
 		private int shadowRad;
 		RouteCalculationResult.NextDirectionInfo calc1;
 
 		private static final Log LOG = PlatformUtil.getLog(TopTextView.class);
+		private boolean showMarker;
 
 		public TopTextView(OsmandApplication app, MapActivity map) {
 			turnDrawable = new NextTurnInfoWidget.TurnDrawable(map, true);
@@ -984,47 +984,21 @@ public class MapInfoWidgetsFactory {
 
 		public boolean updateInfo(DrawSettings d) {
 			RoutingHelper.CurrentStreetName streetName = null;
-			String exitRef = null;
-			TurnType[] type = new TurnType[1];
-			boolean showNextTurn = false;
-			boolean showMarker = this.showMarker;
-			ExitInfo exitInfo = null;
-			RouteDataObject shieldObject = null;
-
+			boolean showClosestWaypointFirstInAddress = true;
 			if (routingHelper != null && routingHelper.isRouteCalculated() && !routingHelper.isDeviatedFromRoute()) {
 				if (routingHelper.isFollowingMode()) {
 					if (settings.SHOW_STREET_NAME.get()) {
 						RouteCalculationResult.NextDirectionInfo nextDirInfo = routingHelper.getNextRouteDirectionInfo(calc1, true);
-						streetName = routingHelper.getCurrentName(type, nextDirInfo);
-						if (type[0] == null) {
-							showMarker = true;
-						} else {
-							turnDrawable.setColor(R.color.nav_arrow);
-						}
-						RouteDirectionInfo nextDirectionInfo = nextDirInfo.directionInfo;
-						// show exit ref
-						if (nextDirectionInfo != null && nextDirectionInfo.getExitInfo() != null &&
-								nextDirInfo.imminent >= 0) {
-							exitRef = exitInfo.getRef();
-							if (!Algorithms.isEmpty(exitInfo.getExitStreetName())) {
-								streetName.text = exitInfo.getExitStreetName();
-							}
-						}
-						// show shield
-						if (nextDirectionInfo != null) {
-							shieldObject = nextDirectionInfo.getRouteDataObject();
-						}
+						streetName = routingHelper.getCurrentName(nextDirInfo);
+						turnDrawable.setColor(R.color.nav_arrow);
 					}
 				} else {
 					int di = MapRouteInfoMenu.getDirectionInfo();
 					if (di >= 0 && map.getMapRouteInfoMenu().isVisible() && di < routingHelper.getRouteDirections().size()) {
-						// TODO shields
-						showNextTurn = true;
+						showClosestWaypointFirstInAddress = false;
 						RouteDirectionInfo next = routingHelper.getRouteDirections().get(di);
-						type[0] = next.getTurnType();
+						streetName = routingHelper.getCurrentName(routingHelper.getNextRouteDirectionInfo(calc1, true));
 						turnDrawable.setColor(R.color.nav_arrow_distant);
-						streetName = new RoutingHelper.CurrentStreetName();
-						streetName.text = RoutingHelper.formatStreetName(next.getStreetName(), null, next.getDestinationName(), "»");
 					}
 				}
 			} else if (map.getMapViewTrackingUtilities().isMapLinkedToLocation() &&
@@ -1041,7 +1015,7 @@ public class MapInfoWidgetsFactory {
 					if (!Algorithms.isEmpty(streetName.text) && lastKnownLocation != null) {
 						double dist = CurrentPositionHelper.getOrthogonalDistance(rt, lastKnownLocation);
 						if (dist < 50) {
-							showMarker = true;
+							streetName.showMarker = true;
 						} else {
 							streetName.text = map.getResources().getString(R.string.shared_string_near) + " " + streetName.text;
 						}
@@ -1050,7 +1024,7 @@ public class MapInfoWidgetsFactory {
 			}
 			if (map.isTopToolbarActive() || !map.getContextMenu().shouldShowTopControls() || MapRouteInfoMenu.chooseRoutesVisible || MapRouteInfoMenu.waypointsVisible) {
 				updateVisibility(false);
-			} else if (!showNextTurn && updateWaypoint()) {
+			} else if (!showClosestWaypointFirstInAddress && updateWaypoint()) {
 				updateVisibility(true);
 				AndroidUiHelper.updateVisibility(addressText, false);
 				AndroidUiHelper.updateVisibility(addressTextShadow, false);
@@ -1061,26 +1035,26 @@ public class MapInfoWidgetsFactory {
 				AndroidUiHelper.updateVisibility(waypointInfoBar, false);
 				AndroidUiHelper.updateVisibility(addressText, true);
 				AndroidUiHelper.updateVisibility(addressTextShadow, shadowRad > 0);
-				boolean update = turnDrawable.setTurnType(type[0]) || showMarker != this.showMarker;
-				this.showMarker = showMarker;
-				if (shieldObject != null && setRoadShield(shieldIcon, shieldObject)) {
+
+				if (streetName.shieldObject != null && setRoadShield(shieldIcon, streetName.shieldObject)) {
 					AndroidUiHelper.updateVisibility(shieldIcon, true);
 				} else {
 					AndroidUiHelper.updateVisibility(shieldIcon, false);
 				}
 
-				if (!Algorithms.isEmpty(exitRef) ) {
-					exitRefText.setText(exitRef);
+				if (!Algorithms.isEmpty(streetName.exitRef) ) {
+					exitRefText.setText(streetName.exitRef);
 					AndroidUiHelper.updateVisibility(exitRefText, true);
 				} else {
 					AndroidUiHelper.updateVisibility(exitRefText, false);
 				}
-				if (update) {
-					if (type[0] != null) {
+				if (turnDrawable.setTurnType(streetName.turnType) || streetName.showMarker != this.showMarker) {
+					this.showMarker = streetName.showMarker;
+					if (streetName.turnType != null) {
 						turnIcon.invalidateDrawable(turnDrawable);
 						turnIcon.setImageDrawable(turnDrawable);
 						AndroidUiHelper.updateVisibility(turnIcon, true);
-					} else if (showMarker) {
+					} else if (streetName.showMarker) {
 						Drawable marker = map.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_start_navigation, R.color.color_myloc_distance);
 						turnIcon.setImageDrawable(marker);
 						AndroidUiHelper.updateVisibility(turnIcon, true);