#808 more changes on ad hoc report