Updates to fix a few bugs related to multiple items for a key.