Some fixes and improovements for datastream uploads.

At least the literal "Label" string should be wrapped in `t()`...