Fix group templates with minimal overriding options