UoN Reporting - fix for 5.16 and 5.17 - context lost when editing report.