Report fixes

Report mitigated to the new style and all incorrect mySQL fixed and
tested