Rearrange tags vs types