Updates to Upcoming Event CPT and Shortcode