Subject substitution now uses the WikipediaBase class