SubjectGenerator: Fix superfluous 'What country' subject in 'What country is Berlin in' (and all similar questions)