Thanks for the update @Alta-MikeD ! A quick note on the map; appreciate it that it now shows WAN side devices on the left, although on one site I have WAN2 configured as a LAN port and the map is showing those devices to the left of the Route10 as well:
Hopefully it would be possible for the map to detect if WAN2 is in standard or WAN mode in a future update. Thanks!