Dev/issue 7443 jmus migration

Some EAD fixes.
Cool... I'll remove it.