Fix issue where an item contains a comma in the display name

Prior to this commit, an item containing a comma in the display name would shift the key/value order.