Simplification du TemplateSelector