Fixes to data view report