diff --git a/pkg/coredata/document.go b/pkg/coredata/document.go
index 15f17d79d..535bd33b0 100644
--- a/pkg/coredata/document.go
+++ b/pkg/coredata/document.go
@@ -319,7 +319,9 @@ func (p *Documents) CountByControlID(
 WITH plcs AS (
 	SELECT
 		p.id,
-		p.tenant_id
+		p.tenant_id,
+		p.search_vector,
+		p.show_on_trust_center
 	FROM
 		documents p
 	INNER JOIN
@@ -428,7 +430,9 @@ func (p *Documents) CountByRiskID(
 WITH plcs AS (
 	SELECT
 		p.id,
-		p.tenant_id
+		p.tenant_id,
+		p.search_vector,
+		p.show_on_trust_center
 	FROM
 		documents p
 	INNER JOIN
@@ -479,7 +483,8 @@ WITH plcs AS (
 		p.current_published_version,
 		p.show_on_trust_center,
 		p.created_at,
-		p.updated_at
+		p.updated_at,
+		p.search_vector
 	FROM
 		documents p
 	INNER JOIN
diff --git a/pkg/coredata/risk.go b/pkg/coredata/risk.go
index 36393b1ff..acf66cc95 100644
--- a/pkg/coredata/risk.go
+++ b/pkg/coredata/risk.go
@@ -136,6 +136,7 @@ WITH rsks AS (
 		r.residual_likelihood,
 		r.residual_impact,
 		r.residual_risk_score,
+		r.search_vector,
 		r.created_at,
 		r.updated_at
 	FROM