[BUGFIX] Use citySelection instead of city (refs #380)