PO links ignore queries
Fix Trick-or-Treat and Forest Curse stacking