better upload queue handling (experimental)