Merge "Make it possible to tag new file uploads without messy queries"