[image-tagging] More improvements in product tagging