Fix formatting
Better differentiate cities with same name in different instances