added handling for shortcode