diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
index 917f883c74..bd8dc29f45 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
@@ -155,6 +155,6 @@ class AdasRecognizedResultDrawer {
                 .owner( DataTypes.TYPE_MARKER_ADAS )
                 .icon( BitmapFactory.decodeResource( mContext.getResources(), R.drawable.module_common_online_car_vr_middle ) )
                 .position( new MogoLatLng( recognizedListResult.latLonList.get( 0 ).lat, recognizedListResult.latLonList.get( 0 ).lon ) );
-        return MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).addMarker( ModuleNames.CARD_TYPE_ROAD_CONDITION, options );
+        return MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).addMarker( DataTypes.TYPE_MARKER_ADAS, options );
     }
 }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
index c45a635e18..974b9674a0 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
@@ -70,6 +70,7 @@ class SnapshotSetDataDrawer {
      */
     public void renderSnapshotData( MogoSnapshotSetData data, boolean filterAdasData ) {
         if ( data == null || data.getAllList() == null || data.getAllList().isEmpty() ) {
+            MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).removeMarkers( DataTypes.TYPE_MARKER_CLOUD_DATA );
             return;
         }
         purgeCloudSnapshotData( data );
@@ -162,6 +163,6 @@ class SnapshotSetDataDrawer {
                 .owner( DataTypes.TYPE_MARKER_CLOUD_DATA )
                 .icon( BitmapFactory.decodeResource( mContext.getResources(), R.drawable.module_common_online_car_vr_middle ) )
                 .position( new MogoLatLng( data.getLat(), data.getLon() ) );
-        return MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).addMarker( ModuleNames.CARD_TYPE_ROAD_CONDITION, options );
+        return MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).addMarker( DataTypes.TYPE_MARKER_CLOUD_DATA, options );
     }
 }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java
index 80733fdf11..945bdda8e2 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java
@@ -101,7 +101,7 @@ public class CloudRoadData implements Parcelable {
     }
 
     public double getDistance() {
-        return distance;
+        return distance * 1000;
     }
 
     public void setDistance(double distance) {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index 4bfff517c3..188236aa96 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -156,7 +156,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
                         if ( data == null ) {
                             return;
                         }
-                        SnapshotSetDataDrawer.getInstance().renderSnapshotData( data, true );
+                        SnapshotSetDataDrawer.getInstance().renderSnapshotData( data, false );
                         VrModeController.getInstance().renderMogoSnapshotSetData( data );
                     }