refactored reports_controller for new types