Breaks Modern Sets
(Code Regression per James)
List of added templates was being cleared out too aggressively. Changed it to be more selective.