ENG-6122 Fix extra column uniqueness when loading.