[WIP, do not merge yet] Fixed wrong workspaceName:

did not handled `null` workspaceName, should use default workspaceName 'default'