Attempt to fix duplicates in pickup selection screens