That versus which is a style question. US publishers tend to prefer the distinction, whereas the Brits almost never do--they freely use which as both restrictive and nonrestrictive. I personally edit my authors following the that/which distinction based on my publishers' expressed preferences, but strictly speaking, which is grammatically correct.