Change classification into three separate drop-down questions

Fixes #2543