Finally fixed all questions mapping