Yeah I don't believe this is the issue I feared it was, but to put some context to it, I was using a hasMany of addresses. But anyway, I think I sorted your other issue with the other comment, as I've been using it pretty well for the last week or so...

I'd love this PR to add my bit below and then be merged, it is so useful!