fixed critical shortcode bugs