Update to make sure Key values use string identifiers, as integer ids break the links.