changes to default template handling