Added attempt to filter non-servers from device list