diff --git a/store/rdbms/compose_record_datasource.go b/store/rdbms/compose_record_datasource.go
index a8165abf7..6ead6139b 100644
--- a/store/rdbms/compose_record_datasource.go
+++ b/store/rdbms/compose_record_datasource.go
@@ -409,6 +409,9 @@ func (r *recordDatasource) baseQuery(f *report.Filter) (sqb squirrel.SelectBuild
 			Column(squirrel.Alias(squirrel.Expr(fmt.Sprintf(tcp, c.Name+".value")), c.Name))
 	}
 
+	// @todo this is temporary!!
+	sqb = squirrel.Select("*").FromSelect(sqb, "q_base")
+
 	// - any initial filtering we may need to do
 	//
 	// @todo better support functions and their validation.