Adapt js controller and view to new Question structure #2220