added lexer/parser for complex queries
added lexer/parser for complex queries