diff --git a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
index dc1843b7..b4012177 100644
--- a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
+++ b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
@@ -276,7 +276,7 @@ public class FreshRSSRepository extends ARepository {
 
         database.itemsIdsDao().deleteItemsIds(account.getId());
         database.itemsIdsDao().insertItemsIds(unreadIds.stream().map(id ->
-                new ItemStateId(0, true, starredIds.stream()
+                new ItemStateId(0, false, starredIds.stream()
                         .anyMatch(starredId -> starredId.equals(id)), id, account.getId()))
                 .collect(Collectors.toList()));
 
diff --git a/db/src/main/java/com/readrops/db/ItemsQueryBuilder.kt b/db/src/main/java/com/readrops/db/ItemsQueryBuilder.kt
index 2e4b5664..66029d61 100644
--- a/db/src/main/java/com/readrops/db/ItemsQueryBuilder.kt
+++ b/db/src/main/java/com/readrops/db/ItemsQueryBuilder.kt
@@ -10,7 +10,8 @@ object ItemsQueryBuilder {
     private val COLUMNS = arrayOf("title", "clean_description", "image_link", "pub_date",
             "read_it_later", "Feed.name", "text_color", "background_color", "icon_url", "read_time",
             "Feed.id as feedId", "Feed.account_id", "Folder.id as folder_id", "Folder.name as folder_name",
-            "case When UnreadItemsIds.remote_id is NULL Then 1 else 0 End read")
+            "case When ItemStateId.remote_id is NULL Or ItemStateId.read = 1 Then 1 else 0 End read",
+            "case When ItemStateId.remote_id is NULL or ItemStateId.starred = 1 Then 1 else 0 End starred")
 
     private val ITEM_COLUMNS = arrayOf(".id", ".remoteId")
 
@@ -47,9 +48,9 @@ object ItemsQueryBuilder {
 
     private fun buildWhereClause(queryFilters: QueryFilters): String = StringBuilder(500).run {
         append("Feed.account_id = ${queryFilters.accountId} And " +
-                "UnreadItemsIds.account_id = ${queryFilters.accountId} Or UnreadItemsIds.account_id is NULL And ")
+                "ItemStateId.account_id = ${queryFilters.accountId} Or ItemStateId.account_id is NULL And ")
 
-        if (!queryFilters.showReadItems) append("read = 0 And ")
+        //if (!queryFilters.showReadItems) append("read = 0 And ")
 
         when (queryFilters.filterType) {
             FilterType.FEED_FILTER -> append("feed_id = ${queryFilters.filterFeedId} And read_it_later = 0")
@@ -77,8 +78,8 @@ object ItemsQueryBuilder {
 
     private fun buildSelectAllJoin(tableName: String): String = """
         $tableName INNER JOIN Feed on $tableName.feed_id = Feed.id
-            LEFT JOIN Folder on Feed.folder_id = Folder.id LEFT JOIN UnreadItemsIds On
-            $tableName.remoteId = UnreadItemsIds.remote_id
+            LEFT JOIN Folder on Feed.folder_id = Folder.id LEFT JOIN ItemStateId On
+            $tableName.remoteId = ItemStateId.remote_id
     """.trimIndent()
 
 }
diff --git a/db/src/main/java/com/readrops/db/dao/ItemDao.java b/db/src/main/java/com/readrops/db/dao/ItemDao.java
index 71eca34e..acb83f7e 100644
--- a/db/src/main/java/com/readrops/db/dao/ItemDao.java
+++ b/db/src/main/java/com/readrops/db/dao/ItemDao.java
@@ -12,7 +12,7 @@ import androidx.sqlite.db.SupportSQLiteQuery;
 import com.readrops.db.entities.Feed;
 import com.readrops.db.entities.Folder;
 import com.readrops.db.entities.Item;
-import com.readrops.db.entities.UnreadItemsIds;
+import com.readrops.db.entities.ItemStateId;
 import com.readrops.db.pojo.ItemWithFeed;
 import com.readrops.db.pojo.StarItem;
 
@@ -23,7 +23,7 @@ import io.reactivex.Completable;
 @Dao
 public interface ItemDao extends BaseDao<Item> {
 
-    @RawQuery(observedEntities = {Item.class, Folder.class, Feed.class, UnreadItemsIds.class})
+    @RawQuery(observedEntities = {Item.class, Folder.class, Feed.class, ItemStateId.class})
     DataSource.Factory<Integer, ItemWithFeed> selectAll(SupportSQLiteQuery query);
 
     @Query("Select * From Item Where id = :itemId")