Added claused query construct to the grammar.