Be able to select provider address where client treated in each case

It would help with multiple providers and incorrect providers being entered if we could make one contact card and select the location client was seen for in each individual case, or be able to change the default address on a case by case basis instead of a provider by provider basis.