Fix date logic
Move report filtering out of the list method