Fix blank enddate bug
Refactor report date handling