diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java
index cb3749b019..e21ca59e52 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
+import com.mapswithme.maps.content.DataSource;
 import com.mapswithme.maps.location.LocationHelper;
 import com.mapswithme.maps.location.LocationListener;
 import com.mapswithme.maps.widget.recycler.RecyclerClickListener;
@@ -31,7 +32,7 @@ import static com.mapswithme.maps.bookmarks.Holders.BaseBookmarkHolder.calculate
 public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookmarkHolder>
 {
   @NonNull
-  private BookmarkCategory mCategory;
+  private final DataSource<BookmarkCategory> mDataSource;
 
   // view types
   static final int TYPE_TRACK = 0;
@@ -53,9 +54,9 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
   @Nullable
   private RecyclerClickListener mClickListener;
 
-  BookmarkListAdapter(@NonNull BookmarkCategory category)
+  BookmarkListAdapter(@NonNull DataSource<BookmarkCategory> dataSource)
   {
-    mCategory = category;
+    mDataSource = dataSource;
   }
 
   public void setOnClickListener(@Nullable RecyclerClickListener listener)
@@ -87,19 +88,19 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
     {
       case TYPE_TRACK:
         holder = new Holders.TrackViewHolder(inflater.inflate(R.layout.item_track, parent,
-                                                              false), mCategory);
+                                                              false));
         break;
       case TYPE_BOOKMARK:
         holder = new Holders.BookmarkViewHolder(inflater.inflate(R.layout.item_bookmark, parent,
-                                                                 false), mCategory);
+                                                                 false));
         break;
       case TYPE_SECTION:
         TextView tv = (TextView) inflater.inflate(R.layout.item_category_title, parent, false);
-        holder = new Holders.SectionViewHolder(tv, mCategory);
+        holder = new Holders.SectionViewHolder(tv);
         break;
       case TYPE_DESC:
         View desc = inflater.inflate(R.layout.item_category_description, parent, false);
-        holder = new Holders.DescriptionViewHolder(desc, mCategory);
+        holder = new Holders.DescriptionViewHolder(desc, getCategory());
         break;
     }
 
@@ -114,25 +115,24 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
   @Override
   public void onBindViewHolder(Holders.BaseBookmarkHolder holder, int position)
   {
-    holder.mCategory = mCategory;
-    holder.bind(position);
+    holder.bind(position, getCategory());
   }
 
   @Override
   public int getItemViewType(int position)
   {
-    final int descPos = getDescSectionPosition(mCategory);
-    final int bmkPos = getBookmarksSectionPosition(mCategory);
-    final int trackPos = getTracksSectionPosition(mCategory);
+    final int descPos = getDescSectionPosition(getCategory());
+    final int bmkPos = getBookmarksSectionPosition(getCategory());
+    final int trackPos = getTracksSectionPosition(getCategory());
 
     if (position == bmkPos || position == trackPos || position == descPos)
       return TYPE_SECTION;
 
-    if (position > bmkPos && !isSectionEmpty(mCategory, SECTION_BMKS))
+    if (position > bmkPos && !isSectionEmpty(getCategory(), SECTION_BMKS))
       return TYPE_BOOKMARK;
-    else if (position > trackPos && !isSectionEmpty(mCategory, SECTION_TRACKS))
+    else if (position > trackPos && !isSectionEmpty(getCategory(), SECTION_TRACKS))
       return TYPE_TRACK;
-    else if (position > descPos && !isSectionEmpty(mCategory, SECTION_DESC))
+    else if (position > descPos && !isSectionEmpty(getCategory(), SECTION_DESC))
       return TYPE_DESC;
 
     throw new IllegalArgumentException("Position not found: " + position);
@@ -147,10 +147,10 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
   @Override
   public int getItemCount()
   {
-    return mCategory.size()
-           + (isSectionEmpty(mCategory, SECTION_TRACKS) ? 0 : 1)
-           + (isSectionEmpty(mCategory, SECTION_BMKS) ? 0 : 1)
-           + getDescItemCount(mCategory);
+    return getCategory().size()
+           + (isSectionEmpty(getCategory(), SECTION_TRACKS) ? 0 : 1)
+           + (isSectionEmpty(getCategory(), SECTION_BMKS) ? 0 : 1)
+           + getDescItemCount(getCategory());
   }
 
   // FIXME: remove this heavy method and use BoomarkInfo class instead.
@@ -161,20 +161,21 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
 
     if (getItemViewType(position) == TYPE_TRACK)
     {
-      int relativePos = calculateTrackPosition(mCategory, position);
-      final long trackId = BookmarkManager.INSTANCE.getTrackIdByPosition(mCategory.getId(), relativePos);
+      int relativePos = calculateTrackPosition(getCategory(), position);
+      final long trackId = BookmarkManager.INSTANCE.getTrackIdByPosition(getCategory().getId(), relativePos);
       return BookmarkManager.INSTANCE.getTrack(trackId);
     }
     else
     {
-      final int pos = calculateBookmarkPosition(mCategory, position);
-      final long bookmarkId = BookmarkManager.INSTANCE.getBookmarkIdByPosition(mCategory.getId(), pos);
+      final int pos = calculateBookmarkPosition(getCategory(), position);
+      final long bookmarkId = BookmarkManager.INSTANCE.getBookmarkIdByPosition(getCategory().getId(), pos);
       return BookmarkManager.INSTANCE.getBookmark(bookmarkId);
     }
   }
 
-  public void updateCategory(@NonNull BookmarkCategory category)
+  @NonNull
+  private BookmarkCategory getCategory()
   {
-    mCategory = category;
+    return mDataSource.getData();
   }
 }
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
index c7550ebb0f..2c8a3b79f4 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
@@ -19,11 +19,11 @@ import android.view.ViewGroup;
 import com.mapswithme.maps.MwmActivity;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmRecyclerFragment;
-import com.mapswithme.maps.bookmarks.data.AbstractCategoriesSnapshot;
 import com.mapswithme.maps.bookmarks.data.Bookmark;
 import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.maps.bookmarks.data.BookmarkSharingResult;
+import com.mapswithme.maps.bookmarks.data.CategoryDataSource;
 import com.mapswithme.maps.bookmarks.data.Track;
 import com.mapswithme.maps.widget.placepage.EditBookmarkFragment;
 import com.mapswithme.maps.widget.placepage.Sponsored;
@@ -45,7 +45,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
 
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private BookmarkCategory mCategory;
+  private CategoryDataSource mCategoryDataSource;
   private int mSelectedPosition;
 
   @CallSuper
@@ -53,7 +53,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
   public void onCreate(@Nullable Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
-    mCategory = getCategoryOrThrow();
+    BookmarkCategory category = getCategoryOrThrow();
+    mCategoryDataSource = new CategoryDataSource(category);
   }
 
   @NonNull
@@ -71,7 +72,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
   @Override
   protected BookmarkListAdapter createAdapter()
   {
-    return new BookmarkListAdapter(mCategory);
+    return new BookmarkListAdapter(mCategoryDataSource);
   }
 
   @Override
@@ -92,7 +93,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
     showPlaceholder(isEmpty);
     ActionBar bar = ((AppCompatActivity) getActivity()).getSupportActionBar();
     if (bar != null)
-      bar.setTitle(mCategory.getName());
+      bar.setTitle(mCategoryDataSource.getData().getName());
     addRecyclerDecor();
   }
 
@@ -139,8 +140,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
   private void configureAdapter()
   {
     BookmarkListAdapter adapter = getAdapter();
-
-    adapter.registerAdapterDataObserver(new CategoryDataObserver());
+    adapter.registerAdapterDataObserver(mCategoryDataSource);
     adapter.startLocationUpdate();
     adapter.setOnClickListener(this);
     adapter.setOnLongClickListener(isCatalogCategory() ? null : this);
@@ -265,7 +265,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
 
   private boolean isCatalogCategory()
   {
-    return mCategory.getType() == BookmarkCategory.Type.CATALOG;
+    return mCategoryDataSource.getData().getType() == BookmarkCategory.Type.CATALOG;
   }
 
   @Override
@@ -273,24 +273,11 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
   {
     if (item.getItemId() == R.id.set_share)
     {
-      SharingHelper.INSTANCE.prepareBookmarkCategoryForSharing(getActivity(), mCategory.getId());
+      SharingHelper.INSTANCE.prepareBookmarkCategoryForSharing(getActivity(),
+                                                               mCategoryDataSource.getData().getId());
       return true;
     }
 
     return super.onOptionsItemSelected(item);
   }
-
-  private class CategoryDataObserver extends RecyclerView.AdapterDataObserver
-  {
-    @Override
-    public void onChanged()
-    {
-      super.onChanged();
-      AbstractCategoriesSnapshot.Default snapshot =
-          BookmarkManager.INSTANCE.getCategoriesSnapshot(mCategory.getType().getFilterStrategy());
-
-      int index = snapshot.indexOfOrThrow(mCategory);
-      getAdapter().updateCategory(snapshot.getItems().get(index));
-    }
-  }
 }
diff --git a/android/src/com/mapswithme/maps/bookmarks/Holders.java b/android/src/com/mapswithme/maps/bookmarks/Holders.java
index 37560fdf02..2767459061 100644
--- a/android/src/com/mapswithme/maps/bookmarks/Holders.java
+++ b/android/src/com/mapswithme/maps/bookmarks/Holders.java
@@ -209,19 +209,16 @@ public class Holders
     @IntDef({ SECTION_TRACKS, SECTION_BMKS, SECTION_DESC})
     public @interface Section {}
 
-    @NonNull
-    BookmarkCategory mCategory;
     @NonNull
     private final View mView;
 
-    BaseBookmarkHolder(@NonNull View itemView, @NonNull BookmarkCategory category)
+    BaseBookmarkHolder(@NonNull View itemView)
     {
       super(itemView);
-      mCategory = category;
       mView = itemView;
     }
 
-    abstract void bind(int position);
+    abstract void bind(int position, @NonNull BookmarkCategory category);
 
     static int calculateTrackPosition(@NonNull BookmarkCategory category, int position)
     {
@@ -325,9 +322,9 @@ public class Holders
     @NonNull
     private final TextView mDistance;
 
-    BookmarkViewHolder(@NonNull View itemView, @NonNull BookmarkCategory category)
+    BookmarkViewHolder(@NonNull View itemView)
     {
-      super(itemView, category);
+      super(itemView);
       mIcon = itemView.findViewById(R.id.iv__bookmark_color);
       mName = itemView.findViewById(R.id.tv__bookmark_name);
       mDistance = itemView.findViewById(R.id.tv__bookmark_distance);
@@ -340,11 +337,11 @@ public class Holders
     }
 
     @Override
-    void bind(int position)
+    void bind(int position, @NonNull BookmarkCategory category)
     {
-      int pos = calculateBookmarkPosition(mCategory, position);
-      final long bookmarkId = BookmarkManager.INSTANCE.getBookmarkIdByPosition(mCategory.getId(), pos);
-      BookmarkInfo bookmark = new BookmarkInfo(mCategory.getId(), bookmarkId);
+      int pos = calculateBookmarkPosition(category, position);
+      final long bookmarkId = BookmarkManager.INSTANCE.getBookmarkIdByPosition(category.getId(), pos);
+      BookmarkInfo bookmark = new BookmarkInfo(category.getId(), bookmarkId);
       mName.setText(bookmark.getTitle());
       final Location loc = LocationHelper.INSTANCE.getSavedLocation();
       if (loc != null)
@@ -377,19 +374,19 @@ public class Holders
     @NonNull
     private final TextView mDistance;
 
-    TrackViewHolder(@NonNull View itemView, @NonNull BookmarkCategory category)
+    TrackViewHolder(@NonNull View itemView)
     {
-      super(itemView, category);
+      super(itemView);
       mIcon = itemView.findViewById(R.id.iv__bookmark_color);
       mName = itemView.findViewById(R.id.tv__bookmark_name);
       mDistance = itemView.findViewById(R.id.tv__bookmark_distance);
     }
 
     @Override
-    void bind(int position)
+    void bind(int position, @NonNull BookmarkCategory category)
     {
-      int relativePos = calculateTrackPosition(mCategory, position);
-      final long trackId = BookmarkManager.INSTANCE.getTrackIdByPosition(mCategory.getId(), relativePos);
+      int relativePos = calculateTrackPosition(category, position);
+      final long trackId = BookmarkManager.INSTANCE.getTrackIdByPosition(category.getId(), relativePos);
       Track track = BookmarkManager.INSTANCE.getTrack(trackId);
       mName.setText(track.getName());
       mDistance.setText(new StringBuilder().append(mDistance.getContext()
@@ -408,16 +405,16 @@ public class Holders
     @NonNull
     private final TextView mView;
 
-    SectionViewHolder(@NonNull TextView itemView, @NonNull BookmarkCategory category)
+    SectionViewHolder(@NonNull TextView itemView)
     {
-      super(itemView, category);
+      super(itemView);
       mView = itemView;
     }
 
     @Override
-    void bind(int position)
+    void bind(int position, @NonNull BookmarkCategory category)
     {
-      final int sectionIndex = getSectionForPosition(mCategory, position);
+      final int sectionIndex = getSectionForPosition(category, position);
       mView.setText(getSections().get(sectionIndex));
     }
 
@@ -446,7 +443,7 @@ public class Holders
 
     DescriptionViewHolder(@NonNull View itemView, @NonNull BookmarkCategory category)
     {
-      super(itemView, category);
+      super(itemView);
       mDescText = itemView.findViewById(R.id.text);
       mTitle = itemView.findViewById(R.id.title);
       mAuthor = itemView.findViewById(R.id.author);
@@ -454,39 +451,39 @@ public class Holders
       mMoreBtn = itemView.findViewById(R.id.more_btn);
       boolean isEmptyDesc = TextUtils.isEmpty(category.getDescription());
       UiUtils.hideIf(isEmptyDesc, mMoreBtn);
-      mMoreBtn.setOnClickListener(this::onMoreBtnClicked);
+      mMoreBtn.setOnClickListener(v -> onMoreBtnClicked(v, category));
     }
 
-    private void onMoreBtnClicked(@NonNull View v)
+    private void onMoreBtnClicked(@NonNull View v, @NonNull BookmarkCategory category)
     {
-      int lineCount = calcLineCount(mDescText, mCategory.getDescription());
+      int lineCount = calcLineCount(mDescText, category.getDescription());
       mDescText.setMaxLines(lineCount);
-      mDescText.setText(mCategory.getDescription());
+      mDescText.setText(category.getDescription());
       v.setVisibility(View.GONE);
     }
 
     @Override
-    void bind(int position)
+    void bind(int position, @NonNull BookmarkCategory category)
     {
-      mTitle.setText(mCategory.getName());
-      bindAuthor();
-      bindDescriptionIfEmpty();
+      mTitle.setText(category.getName());
+      bindAuthor(category);
+      bindDescriptionIfEmpty(category);
     }
 
-    private void bindDescriptionIfEmpty()
+    private void bindDescriptionIfEmpty(@NonNull BookmarkCategory category)
     {
       if (TextUtils.isEmpty(mDescText.getText()))
       {
-        String desc = TextUtils.isEmpty(mCategory.getAnnotation())
-                         ? mCategory.getDescription()
-                         : mCategory.getAnnotation();
+        String desc = TextUtils.isEmpty(category.getAnnotation())
+                         ? category.getDescription()
+                         : category.getAnnotation();
         mDescText.setText(desc);
       }
     }
 
-    private void bindAuthor()
+    private void bindAuthor(@NonNull BookmarkCategory category)
     {
-      BookmarkCategory.Author author = mCategory.getAuthor();
+      BookmarkCategory.Author author = category.getAuthor();
       Context c = itemView.getContext();
       CharSequence authorName = author == null
                                 ? null
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java b/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java
new file mode 100644
index 0000000000..a47c6401bd
--- /dev/null
+++ b/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java
@@ -0,0 +1,36 @@
+package com.mapswithme.maps.bookmarks.data;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+
+import com.mapswithme.maps.content.DataSource;
+
+public class CategoryDataSource extends RecyclerView.AdapterDataObserver implements
+                                                                         DataSource<BookmarkCategory>
+{
+  @NonNull
+  private BookmarkCategory mCategory;
+
+  public CategoryDataSource(@NonNull BookmarkCategory category)
+  {
+    mCategory = category;
+  }
+
+  @NonNull
+  @Override
+  public BookmarkCategory getData()
+  {
+    return mCategory;
+  }
+
+  @Override
+  public void onChanged()
+  {
+    super.onChanged();
+    AbstractCategoriesSnapshot.Default snapshot =
+        BookmarkManager.INSTANCE.getCategoriesSnapshot(mCategory.getType().getFilterStrategy());
+
+    int index = snapshot.indexOfOrThrow(mCategory);
+    mCategory = snapshot.getItems().get(index);
+  }
+}
diff --git a/android/src/com/mapswithme/maps/content/DataSource.java b/android/src/com/mapswithme/maps/content/DataSource.java
new file mode 100644
index 0000000000..39bb883119
--- /dev/null
+++ b/android/src/com/mapswithme/maps/content/DataSource.java
@@ -0,0 +1,9 @@
+package com.mapswithme.maps.content;
+
+import android.support.annotation.NonNull;
+
+public interface DataSource<D>
+{
+  @NonNull
+  D getData();
+}