reporting fixes
Merge branch 'back-end-working'