Create and update Entities from repeats

[ahblake]

Hi Gareth, I'll try to prune down the form to the minimum that causes the issue and share it.