fix resolved entities