+ fixes for patient shortcode changes