entry data extraction fixes