#239 improve shortcuts mechanism

#239