Added counter to /reports list, performance
Cleaned up code