Reverting to individual TPRatePlan load
Bug fixup in loader