[46308/46514] Template-system: Fixed some issues