working version of the query syntax highlighter
Merge remote-tracking branch 'origin/master'