refactor query parser
additional query clause parse spec