Fix more formatting for queries.