Tested and fixed, refactored the Reporting DB queries to prepare data
for converter method.