[Tags]: bug fix & improvement