Renamed view_state.sidebar_entities to view_state.bookmarks to reflect UI. Avoid building new entities when reconstructing bookmarks. Bookmarks should always use the same CIDs as entities found in current_user.