Fix questions' iterator problems