diff --git a/android/src/com/mapswithme/country/CountrySuggestFragment.java b/android/src/com/mapswithme/country/CountrySuggestFragment.java
index 183cc9e8cc..97fac0a28f 100644
--- a/android/src/com/mapswithme/country/CountrySuggestFragment.java
+++ b/android/src/com/mapswithme/country/CountrySuggestFragment.java
@@ -213,7 +213,7 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
 
   private int storageOptionsRequested()
   {
-    return StorageOptions.MAP_OPTION_MAP_AND_CAR_ROUTING;
+    return StorageOptions.MAP_OPTION_MAP_ONLY;
   }
 
   private void selectMapForDownload()
diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java
index 88cd4d99a2..8d761fd11c 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingController.java
@@ -171,8 +171,8 @@ public class RoutingController
       {
         cancel();
 
-        ActiveCountryTree.downloadMapsForIndices(mLastMissingCountries, StorageOptions.MAP_OPTION_MAP_AND_CAR_ROUTING);
-        ActiveCountryTree.downloadMapsForIndices(mLastMissingRoutes, StorageOptions.MAP_OPTION_CAR_ROUTING);
+        ActiveCountryTree.downloadMapsForIndices(mLastMissingCountries, StorageOptions.MAP_OPTION_MAP_ONLY);
+        ActiveCountryTree.downloadMapsForIndices(mLastMissingRoutes, StorageOptions.MAP_OPTION_MAP_ONLY);
 
         if (mContainer != null)
           mContainer.showDownloader(true);
diff --git a/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java b/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java
index 58aa05c4dd..57a5266b39 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java
@@ -16,6 +16,12 @@ import android.view.ViewTreeObserver;
 import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
 import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import com.mapswithme.country.StorageOptions;
 import com.mapswithme.maps.MapStorage;
 import com.mapswithme.maps.MwmApplication;
@@ -25,11 +31,6 @@ import com.mapswithme.maps.base.BaseMwmDialogFragment;
 import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.UiUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public class RoutingErrorDialogFragment extends BaseMwmDialogFragment
 {
   private static final String EXTRA_RESULT_CODE = "ResultCode";
@@ -71,7 +72,7 @@ public class RoutingErrorDialogFragment extends BaseMwmDialogFragment
     {
       View view;
       if (hasSingleIndex(mMissingCountries) && !hasIndex(mMissingRoutes))
-        view = buildSingleMapView(titleMessage.second, mMissingCountries[0], StorageOptions.MAP_OPTION_MAP_AND_CAR_ROUTING);
+        view = buildSingleMapView(titleMessage.second, mMissingCountries[0], StorageOptions.MAP_OPTION_MAP_ONLY);
       else
         view = buildMultipleMapView(titleMessage.second);
 
diff --git a/map/active_maps_layout.cpp b/map/active_maps_layout.cpp
index 3fe2417e5b..a48196990b 100644
--- a/map/active_maps_layout.cpp
+++ b/map/active_maps_layout.cpp
@@ -295,7 +295,6 @@ void ActiveMapsLayout::DeleteMap(TGroup const & group, int position, MapOptions
 void ActiveMapsLayout::RetryDownloading(TGroup const & group, int position)
 {
   Item const & item = GetItemInGroup(group, position);
-  ASSERT(item.m_options != item.m_downloadRequest, ());
   m_framework.DownloadCountry(item.Index(), item.m_downloadRequest);
 }