@ Ryan
Understood. I’ve logged it as the bug. It seems like it more sense if you have specified address types, the map should respect that.