LPS-33924 Fix duplicated ids