address upload performance - issue #40