Image shortcode bug fixes