Fix columns for shipping address country