Updated Shortcode Logic Associated With Products