Fixed Question controller bugs