Fix batch upload after refactoring

[tpwrules]

Fixes the most important issue of multiple data points per request having been broken.

Also fixes some date sorting to correctly implement the protocol statement that "The result of sending a request with arrays of data points in a certain order shall be the same as sending an individual request for each data point in that same order (assuming the requests are sent serially and no errors are encountered)."