Shorcode generator improved