Need to query based on the keys, not the values

Change-Id: I6bc376d5c224309b1a0dccc84f4a64837fd323e7