Fix returning bad image tags