bug 4505 followup - template changes