fix Entity checking, update migrate Janus scripts