LPS-41613 Fix duplicated ids