fix #2: use more generic units instead of countries