improve unsafe upload tokens