Preguntas calculadas #7212

This shouldn't be part of your PR