Fix from Xiang for infobar crashes updating tags