Reports Improvements - refs BT#7998