Tweaks implementing date-based filtering in forma-tap