diff --git a/internal/storage/category.go b/internal/storage/category.go
index 285b3f97..c3ea5534 100644
--- a/internal/storage/category.go
+++ b/internal/storage/category.go
@@ -126,10 +126,10 @@ func (s *Storage) CategoriesWithFeedCount(userID int64) (model.Categories, error
 			(SELECT count(*)
 			   FROM feeds
 			     JOIN entries ON (feeds.id = entries.feed_id)
-			   WHERE feeds.category_id = c.id AND entries.status = 'unread') AS count_unread
+			   WHERE feeds.category_id = c.id AND entries.status = $1) AS count_unread
 		FROM categories c
 		WHERE
-			user_id=$1
+			user_id=$2
 	`
 
 	if user.CategoriesSortingOrder == "alphabetical" {
@@ -145,7 +145,7 @@ func (s *Storage) CategoriesWithFeedCount(userID int64) (model.Categories, error
 		`
 	}
 
-	rows, err := s.db.Query(query, userID)
+	rows, err := s.db.Query(query, model.EntryStatusUnread, userID)
 	if err != nil {
 		return nil, fmt.Errorf(`store: unable to fetch categories: %v`, err)
 	}
diff --git a/internal/storage/entry.go b/internal/storage/entry.go
index 647db94f..c2db3354 100644
--- a/internal/storage/entry.go
+++ b/internal/storage/entry.go
@@ -323,12 +323,12 @@ func (s *Storage) ArchiveEntries(status string, days, limit int) (int64, error)
 		UPDATE
 			entries
 		SET
-			status='removed'
+			status=$1
 		WHERE
-			id=ANY(SELECT id FROM entries WHERE status=$1 AND starred is false AND share_code='' AND created_at < now () - '%d days'::interval ORDER BY created_at ASC LIMIT %d)
+			id=ANY(SELECT id FROM entries WHERE status=$2 AND starred is false AND share_code='' AND created_at < now () - '%d days'::interval ORDER BY created_at ASC LIMIT %d)
 	`
 
-	result, err := s.db.Exec(fmt.Sprintf(query, days, limit), status)
+	result, err := s.db.Exec(fmt.Sprintf(query, days, limit), model.EntryStatusRemoved, status)
 	if err != nil {
 		return 0, fmt.Errorf(`store: unable to archive %s entries: %v`, status, err)
 	}