Expect '||' delimited string for match_columns

This partially reverts 339f6342db06eb8f333be2ef4cddea2ac26d8e9a