Improving the network drive detection routines

[#83945182]