Hydrator updates EmbedOne instead of replacing (if possible)

Fixes #968 

/cc @vkartaviy