wip core reports update with loan derived fields