diff --git a/apis/cqn.d.ts b/apis/cqn.d.ts
index 35bec7e5..f65a7b6d 100644
--- a/apis/cqn.d.ts
+++ b/apis/cqn.d.ts
@@ -1,8 +1,11 @@
-import { entity } from './csn' // cyclic dependency
+import { EntityElements, entity } from './csn' // cyclic dependency
 import { UnionToIntersection, UnionsToIntersections } from './internal/inference'
 
 // FIXME: a union type would be more appropriate here
-export type Query = Partial<SELECT & INSERT & UPDATE & DELETE & CREATE & DROP & UPSERT>
+// FIXME: This type is also used for req.query.
+//				It misses the QL functionality of req.query.
+//				It includes SELECT.elements for now but that should be expressed differently.
+export type Query = Partial< (SELECT & {elements: EntityElements}) & INSERT & UPDATE & DELETE & CREATE & DROP & UPSERT>
 
 export type SELECT = { SELECT: {
   distinct?: true,
diff --git a/test/typescript/apis/project/cds-ql.ts b/test/typescript/apis/project/cds-ql.ts
index ce26cd42..219e2a0d 100644
--- a/test/typescript/apis/project/cds-ql.ts
+++ b/test/typescript/apis/project/cds-ql.ts
@@ -10,6 +10,7 @@ SELECT.from(Foos).columns("x") // x was suggested by code completion
 sel.from(Foos)
 sel.columns("x") // x was suggested by code completion
 sel.SELECT.columns?.filter(e => !e) // check if this is array
+sel.elements
 
 // ensure ql returns a proper CQN
 const s = SELECT.from(Foos).columns('ID').where('ID =', 42)
diff --git a/test/typescript/apis/project/cds-services.ts b/test/typescript/apis/project/cds-services.ts
index bbfb7824..7ad87a8b 100644
--- a/test/typescript/apis/project/cds-services.ts
+++ b/test/typescript/apis/project/cds-services.ts
@@ -161,6 +161,11 @@ srv.before('*', async req => {
   req.tenant
   req.target.name
   req.entity
+
+  req.query
+  req.query.elements
+  // req.query.where('x =', 9)
+  (req.query as SELECT<Foo>).SELECT.from.ref
 })
 
 srv.after('*', (results, req) => {