Improvements in secondary_row_suppression_constraint