Fixed issues with choosing the correct upload type.