Fixed hardcoding error and updated logic for reports
Updated reports logic and data model