FS-5832 - additional case of switchname/hostname