diff --git a/PHI-CL/control/infinity-container.lua b/PHI-CL/control/infinity-container.lua
index f43288d..16f2d82 100644
--- a/PHI-CL/control/infinity-container.lua
+++ b/PHI-CL/control/infinity-container.lua
@@ -13,7 +13,7 @@ do
     local j = 1
 
     for _, i in pairs(prototypes.item) do
-        if not (i.hidden or (i.subgroup and hide[i.subgroup])) then
+        if not (i.hidden or (i.subgroup and i.subgroup.name and hide[i.subgroup.name])) then
             for _, q in pairs(prototypes.quality) do
                 table.insert(chest_filter[q.name], {index = j, name = i.name, quality = q.name, mode = 'exactly', count = i.stack_size})
             end
diff --git a/PHI-CL/data/f/ct.lua b/PHI-CL/data/f/ct.lua
index 7fa4676..46f3274 100644
--- a/PHI-CL/data/f/ct.lua
+++ b/PHI-CL/data/f/ct.lua
@@ -6,9 +6,13 @@ local hide = {
 if data.raw['infinity-container']['super-infinity-chest'] then
     local sc = 1
 
-    for _, i in pairs(data.raw.item) do
-        if not (i.hidden or (i.subgroup and hide[i.subgroup])) then
-            sc = sc + 1
+    for _, c in pairs({'ammo', 'armor', 'capsule', 'gun', 'item'}) do
+        if data.raw[c] then
+            for _, i in pairs(data.raw[c]) do
+                if not (i.hidden or (i.subgroup and hide[i.subgroup])) then
+                    sc = sc + 1
+                end
+            end
         end
     end