Now the workspace ID is applied consistently