fixed update and remove handlers to use ObjectIds instead of strings