Re-base primary display on data-point, not on country

big work...