Some reordering of the tags