Improved EditorModal Template
Autocomplete with shortName support