added legacy shortcode support