diff --git a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java
index 3618bb69ff..dd7569a0d0 100644
--- a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java
@@ -16,7 +16,6 @@ import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.maps.bookmarks.data.CatalogCustomProperty;
 import com.mapswithme.maps.bookmarks.data.CatalogTagsGroup;
-import com.mapswithme.maps.ugc.routes.UgcRouteTagsActivity;
 import com.mapswithme.util.SharedPropertiesUtils;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.sharing.TargetUtils;
@@ -132,8 +131,8 @@ public class CachedBookmarkCategoriesFragment extends BaseBookmarkCategoriesFrag
 
   private void openBookmarksCatalogScreen()
   {
-    Intent intent = new Intent(getContext(), UgcRouteTagsActivity.class);
-    startActivity(intent);
+    BookmarksCatalogActivity.startForResult(this, BookmarksCatalogActivity.REQ_CODE_CATALOG);
+    Statistics.INSTANCE.trackOpenCatalogScreen();
   }
 
   @Override
diff --git a/omim_config.h b/omim_config.h
index f2992c64f1..d6b3a95de0 100644
--- a/omim_config.h
+++ b/omim_config.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#define TEST_ADS_REMOVAL_IDS
-#define STAGE_BOOKMARKS_CATALOG_SERVER
-#define STAGE_CLOUD_SERVER
-#define STAGE_LOCALS_SERVER
-#define STAGE_PASSPORT_SERVER
-#define STAGE_PURCHASE_SERVER
-#define STAGE_UGC_SERVER
+//#define TEST_ADS_REMOVAL_IDS
+//#define STAGE_BOOKMARKS_CATALOG_SERVER
+//#define STAGE_CLOUD_SERVER
+//#define STAGE_LOCALS_SERVER
+//#define STAGE_PASSPORT_SERVER
+//#define STAGE_PURCHASE_SERVER
+//#define STAGE_UGC_SERVER