Fix bug with server name and add visible watch