wip update core reports to use derived loan fields