fix text parser tokens to expression grouping