fixed errors in entity maps