rebuild to adopt is_highest_primary_identifier