Start fixing non-unique labels bug