With the first meaning you have already shown that we can have which or that. With the second meaning you said that we could only have "which". That's true as you punctuated it, but if you punctuate it as I have then we can only have "that".
