Tag changes for image #8504