Perform activity update when inserting with duplicate key
Avoid additional lookup of model on activity update
Ensure that id is always returned with update response