template handling on client adapted to new template situation