UploadedTo: improvements to 3d1693ec11b02d5bdda1690927b2635f8b285c9b