Fix images not being properly tagged