XQuery Highlighter Improvements

Major improvements in the XQuery highlighter.
Fix minor bugs in the XQuery Parser.