Filter on date and date2. Fix #25