Fix for QuestionParser and update for Index