2 bugs removed

- choice-categories were not shown properly
- rebuild of shuffle-values were not correct