Fix uploads and re-order on delete
More stable ordering