Add post-upload categorization to Multiple Upload

Some of the related changes snuck in last commit too