Add handling of name search across cities

Closes #356