- Add parameters to Aggregate report
- small bug fixes