Merge "Change containers to list if string"