Improving questionario.tpl #282