R# cleanup
Added support for image tags