#808 - some changes to ad hoc report layout