updated shortcode handles