in any case where we're currently searching for exact matches on name, we should be searching on the key.