MDL-37558 Added ability to show shortname in more places