Work on bug #8139.  I added a filter for gateways in the device list.