Add labels for sub-questions, fix bug
Add additional info for rubric question