Add support for multi-field concatenated terms.