Enforcing Fig. for ImageTag and fixing caption for images without text