Lergo-138 Improve QuizStep