fix templates for lists and collections