Shortcode improvements