settlement date filter hydrate & preserve etc, close #33