shortcode improvement / fix