#1 working on query lexer