shortcode + ToS updates