Improve handling of overridden templates with Bootstrap example