Added support for spaces in server names