[matcher] fix handling of CFields (closes #3680)
add test (closes #3681)