Query Parser: fixed ws preservation problem for complex expression