shortcode insert fixes