Wrong message key and event used when primary key is updated

When the primary key of a record is updated a sequence of delete and insert records is created. The insert record should use the new key but does not. Also the opeartion is set to update instead of insert.