Fixed queries issue1