Fix #18168

Change the network lookup to be more robust and find aliases
Fix #18168