1.x improve entity id migration fixes #710