fix upload & gallery shortcode issues