Improve the questions controller

#83