Modified to filter questions