Patch for tags improvement