rearrange header property serialization