#427 [Rishi] - Changing the District/Country display to "District, Country"