+ updates for changes to patient shortcode