Tokenized tag input, bugfixes