Fix more old style AR queries.