fix shipping address mappings