#167 improved autoindent compatability for queries with comments