Hotfix bad column indices on reporting
Merge branch 'dev'