Fixed template issues refs #20578