Optimize report service

Fix previous data