Incomplete shortcuts management as requested in #8