Remove unused/unnecessary unique ids from queries
Add user active status to report data and reports