Fix combos in tables of column cardinality bigger than the columns being used in combo being broken (#19368)

Pursuant to #18676. Whacks a regression from the second fix of the combo viz