VID-1696 - Include country names on the fly
cc @garthwebb