diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt
index de47518d3b..b3d6ab2894 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt
@@ -30,7 +30,7 @@ class PM2ADASPresenter(view: PM2HPMapFragment?) :
 
     override fun updateHDMapStations(stations: MutableList<MutableList<Double>>) {
         for (i in stations.indices){
-            mView?.setMapMaker(M2_MAP_STATION_MAKER,stations[i])
+            mView?.setMapMaker(M2_MAP_STATION_MAKER+i,stations[i])
         }
 
     }
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt
index 59c671270c..11934b3cd2 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt
@@ -120,7 +120,7 @@ class PM2HPMapFragment :
         val removeMapMarkerRunnable = Runnable {
             d("RemoveMapMaker=" + Thread.currentThread().name, uuid)
             val overlayManager = getOverlayManager()
-            overlayManager?.removePoint(uuid)
+            overlayManager?.removeAllPointsInOwner(TYPE_MARKER_M2_LINE)
         }
         OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable)
     }
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
index 54477279cc..c7358e8c95 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
@@ -47,9 +47,14 @@ public class ObjectUtils {
                 descriptors.add(new BitmapDescriptor(icon));
             }
         }
+        MarkerOptions markerOptions;
+        if(TextUtils.isEmpty(opt.getId())){
+            markerOptions = new MarkerOptions();
+        }else{
+            markerOptions = new MarkerOptions(opt.getId());
+        }
 
-        MarkerOptions markerOptions = new MarkerOptions()
-                .setGps(opt.isGps())
+        markerOptions.setGps(opt.isGps())
                 .position(new LonLatPoint(opt.getLongitude(), opt.getLatitude()))
                 .anchor(opt.getU(), opt.getV())
                 .icons(descriptors)