Upgrade templates option messes up existing templates

Support
2

I fixed it for you!

Upgrading can cause the overlap issue documented here (includes fix), for anyone else encountering the same.