improved tinymce shortcodes