Maybe I am misunderstanding, but what you explained sounds right. You said:

with map key type AddressType and value type Address

so we have a Map<AddressType,Address> right?

And then you said that "select key(r) ...":

causes the columns of AddressType to be selected instead of the value columns.

But key(r) should lead to the AddressType columns being selected. So I am confused.