Modified upload handler for android so it takes tags.