Fixed tags saving issue