Move more queries to 1 line.