make links for labels, and minor bug fix in data loader