diff --git a/src/controllers/api/modularWeaponCraftingController.ts b/src/controllers/api/modularWeaponCraftingController.ts
index 32d79057..91809b49 100644
--- a/src/controllers/api/modularWeaponCraftingController.ts
+++ b/src/controllers/api/modularWeaponCraftingController.ts
@@ -139,20 +139,15 @@ export const modularWeaponCraftingController: RequestHandler = async (req, res)
         defaultUpgrades = getDefaultUpgrades(data.Parts);
     }
 
-    if (category == "MoaPets" && data.WeaponType.startsWith("/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPet")) {
-        const defaultWeaponMap = {
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetAPowerSuit":
-                "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetMeleeWeaponIP",
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetBPowerSuit":
-                "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetMeleeWeaponIS",
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetCPowerSuit":
-                "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetMeleeWeaponPS"
-        };
-        if (data.WeaponType in defaultWeaponMap) {
-            const weapon = defaultWeaponMap[data.WeaponType as keyof typeof defaultWeaponMap];
+    if (category == "MoaPets") {
+        const weapon = ExportSentinels[data.WeaponType].defaultWeapon;
+        if (weapon) {
             const category = ExportWeapons[weapon].productCategory;
-            addEquipment(inventory, category, weapon);
-            occupySlot(inventory, productCategoryToInventoryBin(category)!, !!data.isWebUi);
+            addEquipment(inventory, category, weapon, undefined, inventoryChanges);
+            combineInventoryChanges(
+                inventoryChanges,
+                occupySlot(inventory, productCategoryToInventoryBin(category)!, !!data.isWebUi)
+            );
         }
     }
     defaultOverwrites.Configs = applyDefaultUpgrades(inventory, defaultUpgrades);
diff --git a/src/controllers/custom/getItemListsController.ts b/src/controllers/custom/getItemListsController.ts
index 09e42dd2..96a61141 100644
--- a/src/controllers/custom/getItemListsController.ts
+++ b/src/controllers/custom/getItemListsController.ts
@@ -66,7 +66,7 @@ const getItemListsController: RequestHandler = (req, response) => {
         });
     }
     for (const [uniqueName, item] of Object.entries(ExportSentinels)) {
-        if (item.productCategory != "SpecialItems") {
+        if (item.productCategory == "Sentinels" || item.productCategory == "KubrowPets") {
             res[item.productCategory].push({
                 uniqueName,
                 name: getString(item.name, lang),