Revisit the shift swap mechanism

Seems like:

• the case when one swap for another swap works fine,
• the market & 'shift edit update' "simplified" swap generate extra shift (to fulfill the 'pair request') and that shift exists later in more copies in backup causing wrong render etc...