Avoid duplicate labels in rows

@garyb Could you please review?