Use pietty upload and remove count==0 bug