Tag changes for image #16824