Fix bug with state transition to list questions on cancel new question and missing count on new choice in question edit