diff --git a/packages/system/src/query-manager.ts b/packages/system/src/query-manager.ts
index 1275c288..3e1e29bf 100644
--- a/packages/system/src/query-manager.ts
+++ b/packages/system/src/query-manager.ts
@@ -76,7 +76,7 @@ export class QueryManager extends EventEmitter<QueryManagerEvents> {
    * Async fetch results
    */
   async fetch(req: RequestBuilder, cb?: (evs: Array<TaggedNostrEvent>) => void) {
-    const filters = req.buildRaw();
+    const filters = req.buildRaw(this.#system);
     const q = this.query(req);
     if (cb) {
       q.on("event", cb);
diff --git a/packages/system/src/request-builder.ts b/packages/system/src/request-builder.ts
index 77d1e05d..7f0342fd 100644
--- a/packages/system/src/request-builder.ts
+++ b/packages/system/src/request-builder.ts
@@ -113,7 +113,7 @@ export class RequestBuilder {
     if (!this.#rawCached && system) {
       this.#rawCached = system.optimizer.compress(this.#builders.map(f => f.filter));
     }
-    return this.#rawCached ?? [];
+    return this.#rawCached ?? this.#builders.map(f => f.filter);
   }
 
   build(system: SystemInterface): Array<BuiltRawReqFilter> {