Correctly keep bouquets with pipzap and toggle pip