Merge branch '487-reports-fixes' into 'master'

Bug fixes for the reports app

Closes #487

See merge request !280
2 jobs for master in 18 minutes and 18 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Build
passed #162271
docker-build
build_linux_36

00:14:49

66.0%
 
  Deploy
passed #162272
docker
deploy_beta

00:03:29