fix topview overwrite problem, fix return_from_upload flag bug