[NUCCORE-1154] Improvement to simplify the multicolumn case