Shortcode template editor:
- Bug fixes
- Tweaks