Fix more queries