Fix mayor & councilmember lookup when no city

Closes #344