diff --git a/BaseClasses.py b/BaseClasses.py
index 61cede10..b773438f 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -2876,11 +2876,11 @@ class Spoiler(object):
         self.locations = OrderedDict()
         listed_locations = set()
 
-        lw_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.type == RegionType.LightWorld]
+        lw_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.type == RegionType.LightWorld and not loc.skip]
         self.locations['Light World'] = OrderedDict([(location.gen_name(), str(location.item) if location.item is not None else 'Nothing') for location in lw_locations])
         listed_locations.update(lw_locations)
 
-        dw_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.type == RegionType.DarkWorld]
+        dw_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.type == RegionType.DarkWorld and not loc.skip]
         self.locations['Dark World'] = OrderedDict([(location.gen_name(), str(location.item) if location.item is not None else 'Nothing') for location in dw_locations])
         listed_locations.update(dw_locations)
 
diff --git a/Fill.py b/Fill.py
index a4468e7d..701a2c7c 100644
--- a/Fill.py
+++ b/Fill.py
@@ -511,7 +511,7 @@ def ensure_good_pots(world, write_skips=False):
             loc.item = ItemFactory('Rupees (5)', loc.item.player)
         # don't write out all pots to spoiler
         if write_skips:
-            if loc.type == LocationType.Pot and loc.item.name in valid_pot_items:
+            if loc.type in [LocationType.Pot, LocationType.Bonk] and loc.item.name in valid_pot_items:
                 loc.skip = True
 
 
diff --git a/ItemList.py b/ItemList.py
index 86dfd92f..6be2606c 100644
--- a/ItemList.py
+++ b/ItemList.py
@@ -563,6 +563,7 @@ def create_farm_locations(world, player):
             loc.event = True
             loc.locked = True
             loc.address = None
+            loc.skip = True
 
             world.push_item(loc, ItemFactory(item_name, player), False)