Tweaks to enable multiple city display