Adds numeric sorting
Rearranges country/orgs relationship