diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 83faf9be80..b695b7f25a 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -1401,61 +1401,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
-  public static class ShowAuthorizationTask implements MapTask
-  {
-    @Override
-    public boolean run(MwmActivity target)
-    {
-      final DialogFragment fragment = (DialogFragment) Fragment.instantiate(target, AuthDialogFragment.class.getName());
-      fragment.show(target.getSupportFragmentManager(), AuthDialogFragment.class.getName());
-      return true;
-    }
-  }
-
-  public static abstract class BaseUserMarkTask implements MapTask
-  {
-    private static final long serialVersionUID = 1L;
-
-    final int mCategoryId;
-    final int mId;
-
-    BaseUserMarkTask(int categoryId, int id)
-    {
-      mCategoryId = categoryId;
-      mId = id;
-    }
-  }
-
-  public static class ShowBookmarkTask extends BaseUserMarkTask
-  {
-    public ShowBookmarkTask(int categoryId, int bookmarkId)
-    {
-      super(categoryId, bookmarkId);
-    }
-
-    @Override
-    public boolean run(MwmActivity target)
-    {
-      BookmarkManager.INSTANCE.nativeShowBookmarkOnMap(mCategoryId, mId);
-      return true;
-    }
-  }
-
-  public static class ShowTrackTask extends BaseUserMarkTask
-  {
-    public ShowTrackTask(int categoryId, int trackId)
-    {
-      super(categoryId, trackId);
-    }
-
-    @Override
-    public boolean run(MwmActivity target)
-    {
-      Framework.nativeShowTrackRect(mCategoryId, mId);
-      return true;
-    }
-  }
-
   void adjustCompass(int offsetY)
   {
     if (mMapFragment == null || !mMapFragment.isAdded())
@@ -1910,4 +1855,59 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     return mMapFragment != null && !mMapFragment.isFirstStart();
   }
+
+  public static class ShowAuthorizationTask implements MapTask
+  {
+    @Override
+    public boolean run(MwmActivity target)
+    {
+      final DialogFragment fragment = (DialogFragment) Fragment.instantiate(target, AuthDialogFragment.class.getName());
+      fragment.show(target.getSupportFragmentManager(), AuthDialogFragment.class.getName());
+      return true;
+    }
+  }
+
+  public static abstract class BaseUserMarkTask implements MapTask
+  {
+    private static final long serialVersionUID = 1L;
+
+    final int mCategoryId;
+    final int mId;
+
+    BaseUserMarkTask(int categoryId, int id)
+    {
+      mCategoryId = categoryId;
+      mId = id;
+    }
+  }
+
+  public static class ShowBookmarkTask extends BaseUserMarkTask
+  {
+    public ShowBookmarkTask(int categoryId, int bookmarkId)
+    {
+      super(categoryId, bookmarkId);
+    }
+
+    @Override
+    public boolean run(MwmActivity target)
+    {
+      BookmarkManager.INSTANCE.nativeShowBookmarkOnMap(mCategoryId, mId);
+      return true;
+    }
+  }
+
+  public static class ShowTrackTask extends BaseUserMarkTask
+  {
+    public ShowTrackTask(int categoryId, int trackId)
+    {
+      super(categoryId, trackId);
+    }
+
+    @Override
+    public boolean run(MwmActivity target)
+    {
+      Framework.nativeShowTrackRect(mCategoryId, mId);
+      return true;
+    }
+  }
 }
diff --git a/map/framework.cpp b/map/framework.cpp
index f3b39d7ace..49c5ed69a3 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -914,6 +914,9 @@ void Framework::ShowBookmark(BookmarkAndCategory const & bnc)
   place_page::Info info;
   FillBookmarkInfo(*mark, bnc, info);
   ActivateMapSelection(true, df::SelectionShape::OBJECT_USER_MARK, info);
+  //TODO
+  //We need to preserve bookmark id in the m_lastTapEvent.
+  //Because in one feature can be several bokmarks.
   m_lastTapEvent = MakeTapEvent(info.GetMercator(), info.GetID(), TapEvent::Source::Other);
 }