Gosh - The reporting data was being queried  wrong. This commit hacks a working version