diff --git a/src/controllers/api/abortDojoComponentController.ts b/src/controllers/api/abortDojoComponentController.ts
index f17179cd..0ad1f074 100644
--- a/src/controllers/api/abortDojoComponentController.ts
+++ b/src/controllers/api/abortDojoComponentController.ts
@@ -13,7 +13,7 @@ import { RequestHandler } from "express";
 
 export const abortDojoComponentController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "LevelKeys");
+    const inventory = await getInventory(accountId, "GuildId LevelKeys");
     const guild = await getGuildForRequestEx(req, inventory);
     const request = JSON.parse(String(req.body)) as IAbortDojoComponentRequest;
 
diff --git a/src/controllers/api/abortDojoComponentDestructionController.ts b/src/controllers/api/abortDojoComponentDestructionController.ts
index 0d4c89ff..75f08f37 100644
--- a/src/controllers/api/abortDojoComponentDestructionController.ts
+++ b/src/controllers/api/abortDojoComponentDestructionController.ts
@@ -1,4 +1,4 @@
-import { getDojoClient, getGuildForRequest, hasAccessToDojo, hasGuildPermission } from "@/src/services/guildService";
+import { getDojoClient, getGuildForRequestEx, hasAccessToDojo, hasGuildPermission } from "@/src/services/guildService";
 import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { GuildPermission } from "@/src/types/guildTypes";
@@ -6,8 +6,8 @@ import { RequestHandler } from "express";
 
 export const abortDojoComponentDestructionController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "LevelKeys");
-    const guild = await getGuildForRequest(req);
+    const inventory = await getInventory(accountId, "GuildId LevelKeys");
+    const guild = await getGuildForRequestEx(req, inventory);
     if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Architect))) {
         res.json({ DojoRequestStatus: -1 });
         return;
diff --git a/src/controllers/api/changeDojoRootController.ts b/src/controllers/api/changeDojoRootController.ts
index 2f0722c7..e28b92d9 100644
--- a/src/controllers/api/changeDojoRootController.ts
+++ b/src/controllers/api/changeDojoRootController.ts
@@ -1,5 +1,5 @@
 import { RequestHandler } from "express";
-import { getDojoClient, getGuildForRequest, hasAccessToDojo, hasGuildPermission } from "@/src/services/guildService";
+import { getDojoClient, getGuildForRequestEx, hasAccessToDojo, hasGuildPermission } from "@/src/services/guildService";
 import { logger } from "@/src/utils/logger";
 import { GuildPermission, IDojoComponentDatabase } from "@/src/types/guildTypes";
 import { Types } from "mongoose";
@@ -8,8 +8,8 @@ import { getInventory } from "@/src/services/inventoryService";
 
 export const changeDojoRootController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "LevelKeys");
-    const guild = await getGuildForRequest(req);
+    const inventory = await getInventory(accountId, "GuildId LevelKeys");
+    const guild = await getGuildForRequestEx(req, inventory);
     if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Architect))) {
         res.json({ DojoRequestStatus: -1 });
         return;
diff --git a/src/controllers/api/destroyDojoDecoController.ts b/src/controllers/api/destroyDojoDecoController.ts
index 1b2517c3..02323720 100644
--- a/src/controllers/api/destroyDojoDecoController.ts
+++ b/src/controllers/api/destroyDojoDecoController.ts
@@ -1,6 +1,6 @@
 import {
     getDojoClient,
-    getGuildForRequest,
+    getGuildForRequestEx,
     hasAccessToDojo,
     hasGuildPermission,
     removeDojoDeco
@@ -12,8 +12,8 @@ import { RequestHandler } from "express";
 
 export const destroyDojoDecoController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "LevelKeys");
-    const guild = await getGuildForRequest(req);
+    const inventory = await getInventory(accountId, "GuildId LevelKeys");
+    const guild = await getGuildForRequestEx(req, inventory);
     if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Decorator))) {
         res.json({ DojoRequestStatus: -1 });
         return;
diff --git a/src/controllers/api/placeDecoInComponentController.ts b/src/controllers/api/placeDecoInComponentController.ts
index 2768be9e..cc96a6b8 100644
--- a/src/controllers/api/placeDecoInComponentController.ts
+++ b/src/controllers/api/placeDecoInComponentController.ts
@@ -1,4 +1,4 @@
-import { getDojoClient, getGuildForRequest, hasAccessToDojo, hasGuildPermission } from "@/src/services/guildService";
+import { getDojoClient, getGuildForRequestEx, hasAccessToDojo, hasGuildPermission } from "@/src/services/guildService";
 import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { GuildPermission } from "@/src/types/guildTypes";
@@ -8,8 +8,8 @@ import { ExportDojoRecipes } from "warframe-public-export-plus";
 
 export const placeDecoInComponentController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "LevelKeys");
-    const guild = await getGuildForRequest(req);
+    const inventory = await getInventory(accountId, "GuildId LevelKeys");
+    const guild = await getGuildForRequestEx(req, inventory);
     if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Decorator))) {
         res.json({ DojoRequestStatus: -1 });
         return;
diff --git a/src/controllers/api/queueDojoComponentDestructionController.ts b/src/controllers/api/queueDojoComponentDestructionController.ts
index 3f8782cb..361f91f8 100644
--- a/src/controllers/api/queueDojoComponentDestructionController.ts
+++ b/src/controllers/api/queueDojoComponentDestructionController.ts
@@ -1,5 +1,5 @@
 import { config } from "@/src/services/configService";
-import { getDojoClient, getGuildForRequest, hasAccessToDojo, hasGuildPermission } from "@/src/services/guildService";
+import { getDojoClient, getGuildForRequestEx, hasAccessToDojo, hasGuildPermission } from "@/src/services/guildService";
 import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { GuildPermission } from "@/src/types/guildTypes";
@@ -7,8 +7,8 @@ import { RequestHandler } from "express";
 
 export const queueDojoComponentDestructionController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "LevelKeys");
-    const guild = await getGuildForRequest(req);
+    const inventory = await getInventory(accountId, "GuildId LevelKeys");
+    const guild = await getGuildForRequestEx(req, inventory);
     if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Architect))) {
         res.json({ DojoRequestStatus: -1 });
         return;
diff --git a/src/controllers/api/startDojoRecipeController.ts b/src/controllers/api/startDojoRecipeController.ts
index ed2b9ab4..04131d65 100644
--- a/src/controllers/api/startDojoRecipeController.ts
+++ b/src/controllers/api/startDojoRecipeController.ts
@@ -2,7 +2,7 @@ import { RequestHandler } from "express";
 import { GuildPermission, IDojoComponentClient } from "@/src/types/guildTypes";
 import {
     getDojoClient,
-    getGuildForRequest,
+    getGuildForRequestEx,
     hasAccessToDojo,
     hasGuildPermission,
     processDojoBuildMaterialsGathered,
@@ -21,8 +21,8 @@ interface IStartDojoRecipeRequest {
 
 export const startDojoRecipeController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "LevelKeys");
-    const guild = await getGuildForRequest(req);
+    const inventory = await getInventory(accountId, "GuildId LevelKeys");
+    const guild = await getGuildForRequestEx(req, inventory);
     if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Architect))) {
         res.json({ DojoRequestStatus: -1 });
         return;