fix tooltip and upload