Fix issue #2257

Fix issue #2257: Remove any long_image/wide_image/tall_image tags before adding them automatically so they're not added twice.