Fix Topology Table to better find remote connected device name