Fix uniqueness check to be on columns not index