Replace group_by parameter by "subgroup"

[tonyfujs]

Also make the groups more explicit:
subgroup= wb_regions
subgroup = wb_income_level
subgroup = none