Fixes type field data not populating issue and refactors customer address saves.