SN-72 Bug fix (now return next last by date and use Timestamp)