Better handling of shortcode attributes