3.0.4: a bit of refactoring for preparation of being able to scroll to a particular date