Fixed Image ShortCode issues