fixed query/query2 issue15