diff --git a/lib/contributors.js b/lib/contributors.js
index 4ccf874c..90cdeb15 100644
--- a/lib/contributors.js
+++ b/lib/contributors.js
@@ -106,8 +106,20 @@ const buildElasticRoleCountQuery = function (contributorList) {
   return {
     size: 0,
     query: {
-      terms: {
-        browseableContributorRole_packed: contributorList
+      bool: {
+        should: [
+          {
+            terms: {
+              'creatorLiteral.keywordLowercased': contributorList
+            }
+          },
+          {
+            terms: {
+              'contributorLiteral.keywordLowercased': contributorList
+            }
+          }
+        ],
+        minimum_should_match: 1
       }
     },
     aggs: {