[*] Shortcuts: Enhancements/corrections according  issue #42