Rearrange annotation order