diff --git a/os_package_registry/package_registry.py b/os_package_registry/package_registry.py
index <HASH>..<HASH> 100644
--- a/os_package_registry/package_registry.py
+++ b/os_package_registry/package_registry.py
@@ -277,7 +277,7 @@ class PackageRegistry(object):
                     },
                     'num_countries': {
                         'cardinality': {
-                            'field': 'package.countryCode.keyword',
+                            'field': 'package.countryCode',
                         },
                     },
                 },
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ with open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='os-package-registry',
-    version='0.0.20',
+    version='0.0.21',
     description=(
         'Manage a registry of packages on an ElasticSearch instance'
     ),
<I> Fix stats endpoint with new index mapping