Fixes some of the bugs with regards to the Workforce report. More todo though.