fixes #8477 - usability improvements to template locking/defaults