More Report By Year Handling and More Performance Fixes and Improvements