Extend shortcodes from plg_content_shortcode. Update attribute handling