Now puts the terms through xmlSafe() as well, to prevent invalid XML with weird terms containing punctuation.