minor fixes and code improvements; track uploading files by both collection and ID since one queue handles all collections