Fixes to the previous commit when we have no reports

Make sure we check we're actually getting dates for first/last report
if not use the active dates instead.
Tweak some whitespace