Update addressfield to be inline with latest addressing.