SSP-952, SSP-953 Fixed number load template issues