Rearrange and fixed some issue related to latest changes in data download