[#144] Fix validation of shortcuts