NEO-192 Shuffle quizz fixes