resolve oversplitted tags bug