Fixed shortcode generator to build the shortcode correctly.