[DF-5505] Fixed template switching