improvements to the tmeplate service