event shortcode tweaks