diff --git a/backend/app/services/content.go b/backend/app/services/content.go
index f64998b..4ee5429 100644
--- a/backend/app/services/content.go
+++ b/backend/app/services/content.go
@@ -22,14 +22,14 @@ func (s *content) List(ctx context.Context, tenantID int64, filter *content_dto.
 	tbl, q := models.ContentQuery.QueryContext(ctx)
 
 	// Filters
-	q = q.Where(tbl.Status.Eq(consts.ContentStatusPublished))
-	if tenantID > 0 {
-		q = q.Where(tbl.TenantID.Eq(tenantID))
-	}
 	if filter.Keyword != nil && *filter.Keyword != "" {
 		keyword := "%" + *filter.Keyword + "%"
 		q = q.Where(tbl.Title.Like(keyword)).Or(tbl.Description.Like(keyword))
 	}
+	q = q.Where(tbl.Status.Eq(consts.ContentStatusPublished))
+	if tenantID > 0 {
+		q = q.Where(tbl.TenantID.Eq(tenantID))
+	}
 	if filter.Genre != nil && *filter.Genre != "" {
 		q = q.Where(tbl.Genre.Eq(*filter.Genre))
 	}