simplify query tokenization