minor conditional edits for shortcode