Fix queries with comments+line breaks + add white-space:pre for jt_string and jta_string