Fixed switch name if it is available
Merge pull request #962 from tboerger/feature/switch-fix

[roxy] Fixed switch name if it is available