diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
index 1f4633db73..0c496cfb00 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
@@ -496,7 +496,7 @@ public class BinaryMapIndexReader {
 			}
 		}
 		Iterator<Entry<TransportIndex, TIntArrayList>> it = groupPoints.entrySet().iterator();
-		if (it.hasNext()) {
+		while (it.hasNext()) {
 			Entry<TransportIndex, TIntArrayList> e = it.next();
 			TransportIndex ind = e.getKey();
 			TIntArrayList pointers = e.getValue();
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/TransportStopsRouteReader.java b/OsmAnd-java/src/main/java/net/osmand/router/TransportStopsRouteReader.java
index 616b66aa55..d077335d0b 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/TransportStopsRouteReader.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/TransportStopsRouteReader.java
@@ -23,7 +23,7 @@ import net.osmand.osm.edit.Way;
 import net.osmand.util.MapUtils;
 
 public class TransportStopsRouteReader {
-	public static final int MISSING_STOP_SEARCH_RADIUS = 30000;
+	public static final int MISSING_STOP_SEARCH_RADIUS = 50000;
 	TLongObjectHashMap<TransportRoute> combinedRoutesCache = new TLongObjectHashMap<TransportRoute>();
 	Map<BinaryMapIndexReader, TIntObjectHashMap<TransportRoute>> routesFilesCache = new LinkedHashMap<BinaryMapIndexReader, 
 			TIntObjectHashMap<TransportRoute>>();
@@ -128,6 +128,7 @@ public class TransportStopsRouteReader {
 				}
 			}
 		}
+		
 		return routesToLoad;
 	}