Query Parser: ws is now preserved