tokenizer and analyzer improvement