ROBE-116 Fix string duplicates