Fixed queries issue2