More robust key value handling in the update pipeline