Add the splitting of tags