Update discarded tags to match P2