Rearrange annotations