CLC-2661 (QA) Reopened: Use correct hash key type

QA branch version of #1797

https://jira.media.berkeley.edu/jira/browse/CLC-2661