fixed dataset entry map problems