fix entity uids