Use database to count team mentions
Fix counting for two-word city names