diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
index 0025d72d76..712bc91503 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
@@ -13,7 +13,6 @@ import com.mapswithme.maps.R;
 import com.mapswithme.maps.adapter.OnItemClickListener;
 import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
-import com.mapswithme.util.statistics.Statistics;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -60,15 +59,8 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
     public void onClick(View v)
     {
       BookmarkCategory category = mHolder.getEntity();
-      BookmarkManager.INSTANCE.toggleCategoryVisibility(category);
-
       int type = BookmarkManager.INSTANCE.getCompilationType(category.getId());
-      String compilationTypeString = type == BookmarkManager.CATEGORY ?
-                                     Statistics.ParamValue.CATEGORY :
-                                     Statistics.ParamValue.COLLECTION;
-      Statistics.INSTANCE.trackGuideVisibilityChange(
-          category.isVisible() ? Statistics.ParamValue.SHOW : Statistics.ParamValue.HIDE,
-          category.getServerId(), compilationTypeString);
+      BookmarkManager.INSTANCE.toggleCompilationVisibility(category, type);
 
       if (type == BookmarkManager.COLLECTION)
         notifyItemChanged(0);
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
index 3832f53737..1e5c163cdb 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
@@ -133,6 +133,24 @@ public enum BookmarkManager
     ICONS.add(new Icon(Icon.PREDEFINED_COLOR_BLUEGRAY, Icon.BOOKMARK_ICON_TYPE_NONE));
   }
 
+  public void toggleCompilationVisibility(@NonNull BookmarkCategory category,
+                                          @CompilationType int type)
+  {
+    boolean isVisible = isVisible(category.getId());
+    setVisibility(category.getId(), !isVisible);
+    Statistics.INSTANCE.trackBookmarksVisibility(Statistics.ParamValue.BOOKMARK_LIST,
+                                                 isVisible ? Statistics.ParamValue.HIDE
+                                                           : Statistics.ParamValue.SHOW,
+                                                 category.isFromCatalog() ? category.getServerId()
+                                                                          : null);
+    String compilationTypeString = type == BookmarkManager.CATEGORY ?
+                                   Statistics.ParamValue.CATEGORY :
+                                   Statistics.ParamValue.COLLECTION;
+    Statistics.INSTANCE.trackGuideVisibilityChange(
+        isVisible ? Statistics.ParamValue.HIDE : Statistics.ParamValue.SHOW,
+        category.getServerId(), compilationTypeString);
+  }
+
   public void toggleCategoryVisibility(@NonNull BookmarkCategory category)
   {
     boolean isVisible = isVisible(category.getId());