diff --git a/common/spaces/plug_space_primitives.ts b/common/spaces/plug_space_primitives.ts
index fa63c955..343601c6 100644
--- a/common/spaces/plug_space_primitives.ts
+++ b/common/spaces/plug_space_primitives.ts
@@ -15,12 +15,9 @@ export class PlugSpacePrimitives implements SpacePrimitives {
   // Used e.g. by the sync engine to see if it should sync a certain path (likely not the case when we have a plug space override)
   public isLikelyHandled(path: string): boolean {
     for (
-      const { pattern, env } of this.hook.spaceFunctions
+      const { pattern } of this.hook.spaceFunctions
     ) {
-      if (
-        path.match(pattern) &&
-        (!this.env || (env && env === this.env))
-      ) {
+      if (path.match(pattern)) {
         return true;
       }
     }
@@ -52,7 +49,6 @@ export class PlugSpacePrimitives implements SpacePrimitives {
       if (
         operation === "listFiles" && (!this.env || (env && env === this.env))
       ) {
-        console.log("Going to run this", this.env, env, name, operation);
         try {
           for (const pm of await plug.invoke(name, [])) {
             allFiles.push(pm);
diff --git a/plugs/query/query.ts b/plugs/query/query.ts
index e4e2d0bf..3c259988 100644
--- a/plugs/query/query.ts
+++ b/plugs/query/query.ts
@@ -1,9 +1,10 @@
 import type { WidgetContent } from "$sb/app_event.ts";
-import { events, language, space, system } from "$sb/syscalls.ts";
+import { events, language, system } from "$sb/syscalls.ts";
 import { parseTreeToAST } from "$sb/lib/tree.ts";
 import { astToKvQuery } from "$sb/lib/parse-query.ts";
 import { jsonToMDTable, renderQueryTemplate } from "../directive/util.ts";
 import { loadPageObject, replaceTemplateVars } from "../template/template.ts";
+import { resolvePath } from "$sb/lib/resolve.ts";
 
 export async function widget(
   bodyText: string,
@@ -44,9 +45,10 @@ export async function widget(
       } else {
         if (parsedQuery.render) {
           // Configured a custom rendering template, let's use it!
+          const templatePage = resolvePath(pageName, parsedQuery.render);
           const rendered = await renderQueryTemplate(
             pageObject,
-            parsedQuery.render,
+            templatePage,
             allResults,
             parsedQuery.renderAll!,
           );