Select delivery address refactorings