#808 - more changes on ad hoc report
#808 - basic steps navigation for ad hoc report