tosulliv: refactoring of date handling