Fixing issues with magnitude key, and with id key on associated origins