Parsing query almost solved.

## v0.2.0002
## for ticket [163]