fix for query lexer