Improve of the query