new sankey and treemap components, also various fixes to support country detail page

Had to fetch upstream