Match a few more Chinese symbols when preparing a query.
Simplified segmentor a little.