added resumption token feature, while fix is needed for from and until features