Fix case for object_type from "Country" to "country" so it's
consistent.  This is a derivation from the PHP implementation.
Implement count for countries & factor "count by" into separate modules.