Updates to make more compatible with alternative URL paths, and more compatible with different option_group_ids for phone types.