Dc/Melanie | #3831 | Fixing choices with space and duplicates