diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index 1fe2c90e23..9a49cf7c93 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -388,7 +388,7 @@ public class AppInitializer implements IProgress {
 							if(ind > 0) {
 								return val.substring(ind + 1);
 							}
-							return val;
+							return "";
 						}
 						return val;
 					}
diff --git a/settings.gradle b/settings.gradle
index 8b1a463072..2b32c3618c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,6 @@
 include ':OsmAnd-java', ':OsmAndCore-sample', ':OsmAnd-telegram'
 include ':OsmAnd'
+include ':plugins:Osmand-Nautical'
+include ':plugins:Osmand-ParkingPlugin'
+include ':plugins:Osmand-SRTMPlugin'
+include ':plugins:Osmand-Skimaps'