Improved match tokenizer