Added filter by date and using timezone