Fixed question display for char and choice
Lots of survey editing work