diff --git a/plugins/eventful.cpp b/plugins/eventful.cpp
index 00b764ad1..58079bacf 100644
--- a/plugins/eventful.cpp
+++ b/plugins/eventful.cpp
@@ -60,7 +60,7 @@ struct ProductInfo {
     MaterialSource material;
 
     bool isValid() {
-        return (material.mat_type >= 0 || material.reagent);
+        return true;//due to mat_type being -1 = any
     }
 };
 
diff --git a/scripts/gui/advfort.lua b/scripts/gui/advfort.lua
index b4744930e..2ed4b9502 100644
--- a/scripts/gui/advfort.lua
+++ b/scripts/gui/advfort.lua
@@ -488,8 +488,10 @@ function getItemsUncollected(job)
     end
     return ret
 end
-function AddItem(tbl,item,recurse)
-    table.insert(tbl,item)
+function AddItem(tbl,item,recurse,skip_add)
+    if not skip_add then
+        table.insert(tbl,item)
+    end
     if recurse then
         local subitems=dfhack.items.getContainedItems(item)
         if subitems~=nil then
@@ -518,6 +520,8 @@ function EnumItems(args)
         for k,v in pairs(args.unit.inventory) do
             if args.inv[v.mode] then
                 AddItem(ret,v.item,args.deep)
+            elseif args.deep then
+                AddItem(ret,v.item,args.deep,true)
             end
         end
     end