Make it easier to add namespace from same server to workspace

Make it easier to add namespace from same server to workspace #1491