Adjusting Tag migration to new format