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 b5833502f6..c3baa3b673 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
@@ -146,17 +146,18 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
 
         List< CloudRoadData > allDatumsList = new ArrayList<>();
         prepareData( data.getAllList(), allDatumsList );
-        Map< String, String > newAdasRecognizedMarkersCaches = new ArrayMap<>(allDatumsList.size());
+        Map< String, String > newMarkersCaches = new ArrayMap<>(allDatumsList.size());
+        Map< String, IMogoMarker > newAdasRecognizedMarkersCaches = new ConcurrentHashMap<>(allDatumsList.size());
         for ( CloudRoadData cloudRoadData : allDatumsList ) {
             cloudKeyCache.remove(cloudRoadData.getUniqueKey());
-//            newAdasRecognizedMarkersCaches.put(cloudRoadData.getUniqueKey(), cloudRoadData.getUniqueKey());
+            newMarkersCaches.put(cloudRoadData.getUniqueKey(), cloudRoadData.getUniqueKey());
             SimpleHandlerThreadPool.getInstance().post(cloudRoadData);
 //            ScopeManager.INSTANCE.mainScope( () -> {
 //                rendCarOneFrame( cloudRoadData, newAdasRecognizedMarkersCaches );
 //            } );
         }
         SimpleHandlerThreadPool.getInstance().removeDirtyMarker(cloudKeyCache.values());
-        cloudKeyCache = newAdasRecognizedMarkersCaches;
+        cloudKeyCache = newMarkersCaches;
 //        ScopeManager.INSTANCE.mainScope( () -> {
 //            sendMessage( MSG_REMOVE_DIRTY_MARKERS, mCloudSnapshotMarkersCaches );
 //            mCloudSnapshotMarkersCaches = newAdasRecognizedMarkersCaches;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
index 7b5c64499e..409cc9d656 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -557,7 +557,7 @@ public class MockIntentHandler implements IntentHandler {
                 break;
             case 47:
                 mLocationMockHandler.sendEmptyMessageDelayed( 1, 200L );
-                mLocationMockHandler.sendEmptyMessageDelayed( 2, 0 );
+//                mLocationMockHandler.sendEmptyMessageDelayed( 2, 0 );
 //                mLocationMockHandler.sendEmptyMessageDelayed( 21, 200 );
 //                mLocationMockHandler.sendEmptyMessageDelayed( 3, 300L );
                 break;