TS uploader logic enhancement