diff --git a/brouter-routing-app/src/main/assets/segments4.zip b/brouter-routing-app/src/main/assets/segments4.zip
index b34a879..310b75f 100644
Binary files a/brouter-routing-app/src/main/assets/segments4.zip and b/brouter-routing-app/src/main/assets/segments4.zip differ
diff --git a/brouter-routing-app/src/main/assets/serverconfig.txt b/brouter-routing-app/src/main/assets/serverconfig.txt
index 61377aa..9128b11 100644
--- a/brouter-routing-app/src/main/assets/serverconfig.txt
+++ b/brouter-routing-app/src/main/assets/serverconfig.txt
@@ -13,4 +13,4 @@ profiles_url=https://brouter.de/brouter/profiles2/
 # these are comma separated arrays
 
 check_lookup=lookups.dat
-check_profiles=car-eco.brf,car-eco-de.brf,car-eco-suspect_scan.brf,car-fast.brf,car-traffic_analysis.brf,fastbike.brf,fastbike-asia-pacific.brf,fastbike-lowtraffic.brf,fastbike-verylowtraffic.brf,hiking-beta.brf,moped.brf,rail.brf,river.brf,shortest.brf,trekking.brf,vm-forum-liegerad-schnell.brf,vm-forum-velomobil-schnell.brf
\ No newline at end of file
+check_profiles=car-eco.brf,car-eco-de.brf,car-eco-suspect_scan.brf,car-fast.brf,fastbike.brf,fastbike-asia-pacific.brf,fastbike-lowtraffic.brf,fastbike-verylowtraffic.brf,hiking-beta.brf,moped.brf,rail.brf,river.brf,safety.brf,shortest.brf,trekking.brf,trekking-ignore-cr.brf,trekking-noferries.brf,trekking-nosteps.brf,trekking-steep.brf,vm-forum-liegerad-schnell.brf,vm-forum-velomobil-schnell.brf
\ No newline at end of file
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
index 8bc737d..a610a63 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
@@ -64,6 +64,7 @@ public class BInstallerView extends View
     
     private long availableSize;
     private File baseDir;
+    private File segmentDir;
     
     private boolean isDownloading = false;
     public static boolean downloadCanceled = false;
@@ -301,7 +302,7 @@ public class BInstallerView extends View
        public void startInstaller() {
 
            baseDir = ConfigHelper.getBaseDir( getContext() );
-
+           segmentDir = new File( baseDir, "brouter/segments4");
            try
            {
              AssetManager assetManager = getContext().getAssets();
@@ -448,7 +449,9 @@ public class BInstallerView extends View
             if ( isDownloading ) btnText = "Cancel Download";
             else if ( delTiles > 0 ) btnText = "Delete " + delTiles + " tiles";
             else if ( rd5Tiles > 0 ) btnText = "Start Download";
-            else if ( tilesVisible && rd5Tiles == 0) btnText = "Update all";
+            else if ( tilesVisible &&
+              rd5Tiles == 0 &&
+              RoutingHelper.hasDirectoryAnyDatafiles( segmentDir )) btnText = "Update all";
 
             if ( btnText != null )
             {
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
index ada010e..2f630a1 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
@@ -128,7 +128,8 @@ public class BRouterView extends View
         File brd = new File( baseDir, "brouter" );
         if ( brd.isDirectory() )
         {
-          if (brd.getAbsolutePath().contains("/Android/data/")) {
+          if ( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q &&
+               !brd.getAbsolutePath().contains("/Android/media/btools.routingapp")) {
             String message = "(previous basedir " + baseDir + " has to migrate )" ;
 
             ( (BRouterActivity) getContext() ).selectBasedir( ( (BRouterActivity) getContext() ).getStorageDirectories(), guessBaseDir(), message );
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReaderInternal.java b/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReaderInternal.java
index cfe5b38..7a7927f 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReaderInternal.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReaderInternal.java
@@ -41,9 +41,9 @@ public class CoordinateReaderInternal extends CoordinateReader
     }
     else
     {
-      internalDir = basedir + "/import";
-      tracksdir = "/import/tracks";
-      rootdir = "/import";
+      internalDir = basedir + "/brouter/import";
+      tracksdir = "/brouter/import/tracks";
+      rootdir = "/brouter/import";
     }
   }
 
diff --git a/misc/profiles2/readme.txt b/misc/profiles2/readme.txt
new file mode 100644
index 0000000..207b329
--- /dev/null
+++ b/misc/profiles2/readme.txt
@@ -0,0 +1,4 @@
+NOTE: 
+
+Please copy a profile before you edit it. 
+The delivered profiles will be overwritten when the lookups.dat changes.
\ No newline at end of file