Tag saving bug fixed