Shortcode generator improved