Implemented SVY-7590 : fix class cast exceptions for shortcuts