make more changes to deal with removing Entry.ig field