Pm/105/fix sort duplicates