diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt
index c31f45af22..11e0767f38 100644
--- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt
@@ -289,7 +289,7 @@ class ObjectIconWidget @JvmOverloads constructor(
     fun setCheckbox(isChecked: Boolean?) {
         with(binding) {
             ivCheckbox.visible()
-            ivCheckbox.isEnabled = isChecked ?: false
+            ivCheckbox.isActivated = isChecked ?: false
             initialContainer.invisible()
             emojiContainer.invisible()
             ivBookmark.gone()
diff --git a/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox_selector.xml b/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox_selector.xml
index d12d2b14e1..b9b364aad3 100644
--- a/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox_selector.xml
+++ b/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_data_view_grid_checkbox_checked" android:state_enabled="true" />
-  <item android:drawable="@drawable/ic_data_view_grid_checkbox" android:state_enabled="false" />
+  <item android:drawable="@drawable/ic_data_view_grid_checkbox_checked" android:state_activated="true" />
+  <item android:drawable="@drawable/ic_data_view_grid_checkbox" android:state_activated="false" />
 </selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/widget_object_icon.xml b/core-ui/src/main/res/layout/widget_object_icon.xml
index f60938c359..48f63bd83a 100644
--- a/core-ui/src/main/res/layout/widget_object_icon.xml
+++ b/core-ui/src/main/res/layout/widget_object_icon.xml
@@ -44,6 +44,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:contentDescription="@string/content_desc_checkbox_icon"
+        android:clickable="true"
         android:src="@drawable/ic_data_view_grid_checkbox_selector"
         android:visibility="invisible" />
 
@@ -53,7 +54,6 @@
         android:layout_height="24dp"
         android:layout_gravity="center"
         android:contentDescription="@string/bookmark_icon"
-        android:src="@drawable/ic_data_view_grid_checkbox_selector"
         android:visibility="gone" />
 
 </merge>
\ No newline at end of file
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt
index 7b2c8a742c..9f5795f4ae 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt
@@ -59,6 +59,7 @@ import com.anytypeio.anytype.presentation.relations.ObjectSetConfig.DEFAULT_LIMI
 import com.anytypeio.anytype.presentation.relations.render
 import com.anytypeio.anytype.presentation.relations.tabs
 import com.anytypeio.anytype.presentation.relations.title
+import com.anytypeio.anytype.presentation.search.ObjectSearchConstants
 import com.anytypeio.anytype.presentation.sets.model.CellView
 import com.anytypeio.anytype.presentation.sets.model.FilterExpression
 import com.anytypeio.anytype.presentation.sets.model.SortingExpression
@@ -190,12 +191,14 @@ class ObjectSetViewModel(
                 val dv = s.dv
                 val view = dv.viewers.find { it.id == v } ?: dv.viewers.firstOrNull()
                 if (view != null) {
+                    val dataViewKeys = dv.relations.map { it.key }
+                    val defaultKeys = ObjectSearchConstants.defaultKeys
                     DataViewSubscriptionContainer.Params(
                         subscription = context,
                         sorts = view.sorts,
                         filters = view.filters,
                         sources = dv.sources,
-                        keys = dv.relations.map { it.key },
+                        keys = defaultKeys + dataViewKeys,
                         limit = DEFAULT_LIMIT,
                         offset = o
                     )
@@ -651,6 +654,7 @@ class ObjectSetViewModel(
     }
 
     fun onTaskCheckboxClicked(target: Id) {
+        Timber.d("onTaskCheckboxClicked: $target")
         viewModelScope.launch {
             val obj = database.store.get(target)
             if (obj != null) {