ebnf fix, couple of query tests